Skip to content

Commit ecb2179

Browse files
JunaMeinholdJunaMeinhold
committed
Upgraded HexaGen and to .net9.0
1 parent 4e0a524 commit ecb2179

File tree

10 files changed

+889
-887
lines changed

10 files changed

+889
-887
lines changed

‎Generator/Generator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="HexaGen" Version="1.1.14-rc1" />
13+
<PackageReference Include="HexaGen" Version="1.1.15-rc18" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎Generator/Program.cs‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
using HexaGen;
22

3-
CsCodeGeneratorConfig config = CsCodeGeneratorConfig.Load("generator.json");
4-
5-
config.SystemIncludeFolders.Add("C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\Llvm\\x64\\lib\\clang\\17\\include");
6-
config.SystemIncludeFolders.Add("C:\\Dev\\vcpkg\\packages\\directxmath_x64-windows\\include\\directxmath");
7-
8-
CsCodeGenerator generator = new(config);
9-
generator.LogToConsole();
10-
generator.Generate("DirectXTex/DirectXTex.h", "../../../../Hexa.NET.DirectXTex/Generated");
3+
BatchGenerator batch = new();
4+
batch.Start()
5+
.Setup<CsCodeGenerator>("generator.json")
6+
.AlterConfig(c =>
7+
{
8+
c.SystemIncludeFolders.Add("C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\Llvm\\x64\\lib\\clang\\18\\include");
9+
c.SystemIncludeFolders.Add("C:\\Dev\\vcpkg\\packages\\directxmath_x64-windows\\include\\directxmath");
10+
})
11+
.Generate("DirectXTex/DirectXTex.h", "../../../../Hexa.NET.DirectXTex/Generated")
12+
.Finish();

‎Hexa.NET.DirectXTex/Generated/Delegates/Delegates.000.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ namespace Hexa.NET.DirectXTex
2222
/// </summary>
2323
[NativeName(NativeNameType.Delegate, "SetCustomProps")]
2424
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
25-
public unsafe delegate void SetCustomProps([NativeName(NativeNameType.Param, "pBag")] [NativeName(NativeNameType.Type, "IPropertyBag2*")] void* pBag);
25+
public unsafe delegate void SetCustomProps([NativeName(NativeNameType.Param, "pBag")] [NativeName(NativeNameType.Type, "IPropertyBag2 *")] void* pBag);
2626

2727
#else
2828
/// <summary>
2929
/// To be documented.
3030
/// </summary>
3131
[NativeName(NativeNameType.Delegate, "SetCustomProps")]
3232
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
33-
public unsafe delegate void SetCustomProps([NativeName(NativeNameType.Param, "pBag")] [NativeName(NativeNameType.Type, "IPropertyBag2*")] nint pBag);
33+
public unsafe delegate void SetCustomProps([NativeName(NativeNameType.Param, "pBag")] [NativeName(NativeNameType.Type, "IPropertyBag2 *")] nint pBag);
3434

3535
#endif
3636

@@ -40,15 +40,15 @@ namespace Hexa.NET.DirectXTex
4040
/// </summary>
4141
[NativeName(NativeNameType.Delegate, "GetMQR")]
4242
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
43-
public unsafe delegate void GetMQR([NativeName(NativeNameType.Param, "qMqr")] [NativeName(NativeNameType.Type, "IWICMetadataQueryReader*")] void* qMqr);
43+
public unsafe delegate void GetMQR([NativeName(NativeNameType.Param, "qMqr")] [NativeName(NativeNameType.Type, "IWICMetadataQueryReader *")] void* qMqr);
4444

4545
#else
4646
/// <summary>
4747
/// To be documented.
4848
/// </summary>
4949
[NativeName(NativeNameType.Delegate, "GetMQR")]
5050
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
51-
public unsafe delegate void GetMQR([NativeName(NativeNameType.Param, "qMqr")] [NativeName(NativeNameType.Type, "IWICMetadataQueryReader*")] nint qMqr);
51+
public unsafe delegate void GetMQR([NativeName(NativeNameType.Param, "qMqr")] [NativeName(NativeNameType.Type, "IWICMetadataQueryReader *")] nint qMqr);
5252

5353
#endif
5454

@@ -58,15 +58,15 @@ namespace Hexa.NET.DirectXTex
5858
/// </summary>
5959
[NativeName(NativeNameType.Delegate, "EvaluateImageFunc")]
6060
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
61-
public unsafe delegate void EvaluateImageFunc([NativeName(NativeNameType.Param, "pixels")] [NativeName(NativeNameType.Type, "const XMVECTOR*")] Vector4* pixels, [NativeName(NativeNameType.Param, "width")] [NativeName(NativeNameType.Type, "size_t")] nuint width, [NativeName(NativeNameType.Param, "y")] [NativeName(NativeNameType.Type, "size_t")] nuint y);
61+
public unsafe delegate void EvaluateImageFunc([NativeName(NativeNameType.Param, "pixels")] [NativeName(NativeNameType.Type, "XMVECTOR const *")] Vector4* pixels, [NativeName(NativeNameType.Param, "width")] [NativeName(NativeNameType.Type, "size_t")] nuint width, [NativeName(NativeNameType.Param, "y")] [NativeName(NativeNameType.Type, "size_t")] nuint y);
6262

6363
#else
6464
/// <summary>
6565
/// To be documented.
6666
/// </summary>
6767
[NativeName(NativeNameType.Delegate, "EvaluateImageFunc")]
6868
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
69-
public unsafe delegate void EvaluateImageFunc([NativeName(NativeNameType.Param, "pixels")] [NativeName(NativeNameType.Type, "const XMVECTOR*")] nint pixels, [NativeName(NativeNameType.Param, "width")] [NativeName(NativeNameType.Type, "size_t")] nuint width, [NativeName(NativeNameType.Param, "y")] [NativeName(NativeNameType.Type, "size_t")] nuint y);
69+
public unsafe delegate void EvaluateImageFunc([NativeName(NativeNameType.Param, "pixels")] [NativeName(NativeNameType.Type, "XMVECTOR const *")] nint pixels, [NativeName(NativeNameType.Param, "width")] [NativeName(NativeNameType.Type, "size_t")] nuint width, [NativeName(NativeNameType.Param, "y")] [NativeName(NativeNameType.Type, "size_t")] nuint y);
7070

7171
#endif
7272

@@ -76,15 +76,15 @@ namespace Hexa.NET.DirectXTex
7676
/// </summary>
7777
[NativeName(NativeNameType.Delegate, "TransformImageFunc")]
7878
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
79-
public unsafe delegate void TransformImageFunc([NativeName(NativeNameType.Param, "outPixels")] [NativeName(NativeNameType.Type, "XMVECTOR*")] Vector4* outPixels, [NativeName(NativeNameType.Param, "inPixels")] [NativeName(NativeNameType.Type, "const XMVECTOR*")] Vector4* inPixels, [NativeName(NativeNameType.Param, "width")] [NativeName(NativeNameType.Type, "size_t")] nuint width, [NativeName(NativeNameType.Param, "y")] [NativeName(NativeNameType.Type, "size_t")] nuint y);
79+
public unsafe delegate void TransformImageFunc([NativeName(NativeNameType.Param, "outPixels")] [NativeName(NativeNameType.Type, "XMVECTOR *")] Vector4* outPixels, [NativeName(NativeNameType.Param, "inPixels")] [NativeName(NativeNameType.Type, "XMVECTOR const *")] Vector4* inPixels, [NativeName(NativeNameType.Param, "width")] [NativeName(NativeNameType.Type, "size_t")] nuint width, [NativeName(NativeNameType.Param, "y")] [NativeName(NativeNameType.Type, "size_t")] nuint y);
8080

8181
#else
8282
/// <summary>
8383
/// To be documented.
8484
/// </summary>
8585
[NativeName(NativeNameType.Delegate, "TransformImageFunc")]
8686
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
87-
public unsafe delegate void TransformImageFunc([NativeName(NativeNameType.Param, "outPixels")] [NativeName(NativeNameType.Type, "XMVECTOR*")] nint outPixels, [NativeName(NativeNameType.Param, "inPixels")] [NativeName(NativeNameType.Type, "const XMVECTOR*")] nint inPixels, [NativeName(NativeNameType.Param, "width")] [NativeName(NativeNameType.Type, "size_t")] nuint width, [NativeName(NativeNameType.Param, "y")] [NativeName(NativeNameType.Type, "size_t")] nuint y);
87+
public unsafe delegate void TransformImageFunc([NativeName(NativeNameType.Param, "outPixels")] [NativeName(NativeNameType.Type, "XMVECTOR *")] nint outPixels, [NativeName(NativeNameType.Param, "inPixels")] [NativeName(NativeNameType.Type, "XMVECTOR const *")] nint inPixels, [NativeName(NativeNameType.Param, "width")] [NativeName(NativeNameType.Type, "size_t")] nuint width, [NativeName(NativeNameType.Param, "y")] [NativeName(NativeNameType.Type, "size_t")] nuint y);
8888

8989
#endif
9090

‎Hexa.NET.DirectXTex/Generated/Extensions/Extensions.000.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static unsafe partial class Extensions
2222
/// </summary>
2323
[NativeName(NativeNameType.Func, "Initialize")]
2424
[return: NativeName(NativeNameType.Type, "HRESULT")]
25-
public static HResult Initialize(this ScratchImage img, [NativeName(NativeNameType.Param, "mdata")] [NativeName(NativeNameType.Type, "const TexMetadata&")] TexMetadata* mdata, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
25+
public static HResult Initialize(this ScratchImage img, [NativeName(NativeNameType.Param, "mdata")] [NativeName(NativeNameType.Type, "TexMetadata const&")] TexMetadata* mdata, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
2626
{
2727
HResult ret = DirectXTex.InitializeNative(img, mdata, flags);
2828
return ret;
@@ -33,7 +33,7 @@ public static HResult Initialize(this ScratchImage img, [NativeName(NativeNameTy
3333
/// </summary>
3434
[NativeName(NativeNameType.Func, "Initialize")]
3535
[return: NativeName(NativeNameType.Type, "HRESULT")]
36-
public static HResult Initialize(this ScratchImage img, [NativeName(NativeNameType.Param, "mdata")] [NativeName(NativeNameType.Type, "const TexMetadata&")] ref TexMetadata mdata, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
36+
public static HResult Initialize(this ScratchImage img, [NativeName(NativeNameType.Param, "mdata")] [NativeName(NativeNameType.Type, "TexMetadata const&")] ref TexMetadata mdata, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
3737
{
3838
fixed (TexMetadata* pmdata = &mdata)
3939
{
@@ -91,7 +91,7 @@ public static HResult InitializeCube(this ScratchImage img, [NativeName(NativeNa
9191
/// </summary>
9292
[NativeName(NativeNameType.Func, "InitializeFromImage")]
9393
[return: NativeName(NativeNameType.Type, "HRESULT")]
94-
public static HResult InitializeFromImage(this ScratchImage img, [NativeName(NativeNameType.Param, "srcImage")] [NativeName(NativeNameType.Type, "const Image")] Image srcImage, [NativeName(NativeNameType.Param, "allow1D")] [NativeName(NativeNameType.Type, "bool")] bool allow1D, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
94+
public static HResult InitializeFromImage(this ScratchImage img, [NativeName(NativeNameType.Param, "srcImage")] [NativeName(NativeNameType.Type, "Image const")] Image srcImage, [NativeName(NativeNameType.Param, "allow1D")] [NativeName(NativeNameType.Type, "bool")] bool allow1D, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
9595
{
9696
HResult ret = DirectXTex.InitializeFromImageNative(img, srcImage, allow1D ? (byte)1 : (byte)0, flags);
9797
return ret;
@@ -102,7 +102,7 @@ public static HResult InitializeFromImage(this ScratchImage img, [NativeName(Nat
102102
/// </summary>
103103
[NativeName(NativeNameType.Func, "InitializeArrayFromImages")]
104104
[return: NativeName(NativeNameType.Type, "HRESULT")]
105-
public static HResult InitializeArrayFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "const Image*")] Image* images, [NativeName(NativeNameType.Param, "nImages")] [NativeName(NativeNameType.Type, "size_t")] nuint nImages, [NativeName(NativeNameType.Param, "allow1D")] [NativeName(NativeNameType.Type, "bool")] bool allow1D, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
105+
public static HResult InitializeArrayFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "Image const *")] Image* images, [NativeName(NativeNameType.Param, "nImages")] [NativeName(NativeNameType.Type, "size_t")] nuint nImages, [NativeName(NativeNameType.Param, "allow1D")] [NativeName(NativeNameType.Type, "bool")] bool allow1D, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
106106
{
107107
HResult ret = DirectXTex.InitializeArrayFromImagesNative(img, images, nImages, allow1D ? (byte)1 : (byte)0, flags);
108108
return ret;
@@ -113,7 +113,7 @@ public static HResult InitializeArrayFromImages(this ScratchImage img, [NativeNa
113113
/// </summary>
114114
[NativeName(NativeNameType.Func, "InitializeArrayFromImages")]
115115
[return: NativeName(NativeNameType.Type, "HRESULT")]
116-
public static HResult InitializeArrayFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "const Image*")] ref Image images, [NativeName(NativeNameType.Param, "nImages")] [NativeName(NativeNameType.Type, "size_t")] nuint nImages, [NativeName(NativeNameType.Param, "allow1D")] [NativeName(NativeNameType.Type, "bool")] bool allow1D, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
116+
public static HResult InitializeArrayFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "Image const *")] ref Image images, [NativeName(NativeNameType.Param, "nImages")] [NativeName(NativeNameType.Type, "size_t")] nuint nImages, [NativeName(NativeNameType.Param, "allow1D")] [NativeName(NativeNameType.Type, "bool")] bool allow1D, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
117117
{
118118
fixed (Image* pimages = &images)
119119
{
@@ -127,7 +127,7 @@ public static HResult InitializeArrayFromImages(this ScratchImage img, [NativeNa
127127
/// </summary>
128128
[NativeName(NativeNameType.Func, "InitializeCubeFromImages")]
129129
[return: NativeName(NativeNameType.Type, "HRESULT")]
130-
public static HResult InitializeCubeFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "const Image*")] Image* images, [NativeName(NativeNameType.Param, "nImages")] [NativeName(NativeNameType.Type, "size_t")] nuint nImages, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
130+
public static HResult InitializeCubeFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "Image const *")] Image* images, [NativeName(NativeNameType.Param, "nImages")] [NativeName(NativeNameType.Type, "size_t")] nuint nImages, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
131131
{
132132
HResult ret = DirectXTex.InitializeCubeFromImagesNative(img, images, nImages, flags);
133133
return ret;
@@ -138,7 +138,7 @@ public static HResult InitializeCubeFromImages(this ScratchImage img, [NativeNam
138138
/// </summary>
139139
[NativeName(NativeNameType.Func, "InitializeCubeFromImages")]
140140
[return: NativeName(NativeNameType.Type, "HRESULT")]
141-
public static HResult InitializeCubeFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "const Image*")] ref Image images, [NativeName(NativeNameType.Param, "nImages")] [NativeName(NativeNameType.Type, "size_t")] nuint nImages, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
141+
public static HResult InitializeCubeFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "Image const *")] ref Image images, [NativeName(NativeNameType.Param, "nImages")] [NativeName(NativeNameType.Type, "size_t")] nuint nImages, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
142142
{
143143
fixed (Image* pimages = &images)
144144
{
@@ -152,7 +152,7 @@ public static HResult InitializeCubeFromImages(this ScratchImage img, [NativeNam
152152
/// </summary>
153153
[NativeName(NativeNameType.Func, "Initialize3DFromImages")]
154154
[return: NativeName(NativeNameType.Type, "HRESULT")]
155-
public static HResult Initialize3DFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "const Image*")] Image* images, [NativeName(NativeNameType.Param, "depth")] [NativeName(NativeNameType.Type, "size_t")] nuint depth, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
155+
public static HResult Initialize3DFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "Image const *")] Image* images, [NativeName(NativeNameType.Param, "depth")] [NativeName(NativeNameType.Type, "size_t")] nuint depth, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
156156
{
157157
HResult ret = DirectXTex.Initialize3DFromImagesNative(img, images, depth, flags);
158158
return ret;
@@ -163,7 +163,7 @@ public static HResult Initialize3DFromImages(this ScratchImage img, [NativeName(
163163
/// </summary>
164164
[NativeName(NativeNameType.Func, "Initialize3DFromImages")]
165165
[return: NativeName(NativeNameType.Type, "HRESULT")]
166-
public static HResult Initialize3DFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "const Image*")] ref Image images, [NativeName(NativeNameType.Param, "depth")] [NativeName(NativeNameType.Type, "size_t")] nuint depth, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
166+
public static HResult Initialize3DFromImages(this ScratchImage img, [NativeName(NativeNameType.Param, "images")] [NativeName(NativeNameType.Type, "Image const *")] ref Image images, [NativeName(NativeNameType.Param, "depth")] [NativeName(NativeNameType.Type, "size_t")] nuint depth, [NativeName(NativeNameType.Param, "flags")] [NativeName(NativeNameType.Type, "CP_FLAGS")] CPFlags flags)
167167
{
168168
fixed (Image* pimages = &images)
169169
{
@@ -197,7 +197,7 @@ public static bool OverrideFormat(this ScratchImage img, [NativeName(NativeNameT
197197
/// To be documented.
198198
/// </summary>
199199
[NativeName(NativeNameType.Func, "GetMetadata")]
200-
[return: NativeName(NativeNameType.Type, "const TexMetadata")]
200+
[return: NativeName(NativeNameType.Type, "TexMetadata const")]
201201
public static TexMetadata GetMetadata(this ScratchImage img)
202202
{
203203
TexMetadata ret = DirectXTex.GetMetadataNative(img);
@@ -208,7 +208,7 @@ public static TexMetadata GetMetadata(this ScratchImage img)
208208
/// To be documented.
209209
/// </summary>
210210
[NativeName(NativeNameType.Func, "GetImage")]
211-
[return: NativeName(NativeNameType.Type, "const Image*")]
211+
[return: NativeName(NativeNameType.Type, "Image const *")]
212212
public static Image* GetImage(this ScratchImage img, [NativeName(NativeNameType.Param, "mip")] [NativeName(NativeNameType.Type, "size_t")] nuint mip, [NativeName(NativeNameType.Param, "item")] [NativeName(NativeNameType.Type, "size_t")] nuint item, [NativeName(NativeNameType.Param, "slice")] [NativeName(NativeNameType.Type, "size_t")] nuint slice)
213213
{
214214
Image* ret = DirectXTex.GetImageNative(img, mip, item, slice);
@@ -219,7 +219,7 @@ public static TexMetadata GetMetadata(this ScratchImage img)
219219
/// To be documented.
220220
/// </summary>
221221
[NativeName(NativeNameType.Func, "GetImages")]
222-
[return: NativeName(NativeNameType.Type, "const Image*")]
222+
[return: NativeName(NativeNameType.Type, "Image const *")]
223223
public static Image* GetImages(this ScratchImage img)
224224
{
225225
Image* ret = DirectXTex.GetImagesNative(img);
@@ -241,7 +241,7 @@ public static nuint GetImageCount(this ScratchImage img)
241241
/// To be documented.
242242
/// </summary>
243243
[NativeName(NativeNameType.Func, "GetPixels")]
244-
[return: NativeName(NativeNameType.Type, "uint8_t*")]
244+
[return: NativeName(NativeNameType.Type, "uint8_t *")]
245245
public static byte* GetPixels(this ScratchImage img)
246246
{
247247
byte* ret = DirectXTex.GetPixelsNative(img);
@@ -252,7 +252,7 @@ public static nuint GetImageCount(this ScratchImage img)
252252
/// To be documented.
253253
/// </summary>
254254
[NativeName(NativeNameType.Func, "GetPixels")]
255-
[return: NativeName(NativeNameType.Type, "uint8_t*")]
255+
[return: NativeName(NativeNameType.Type, "uint8_t *")]
256256
public static string GetPixelsS(this ScratchImage img)
257257
{
258258
string ret = Utils.DecodeStringUTF8(DirectXTex.GetPixelsNative(img));
@@ -306,7 +306,7 @@ public static void Release(this Blob blob)
306306
/// To be documented.
307307
/// </summary>
308308
[NativeName(NativeNameType.Func, "BlobGetBufferPointer")]
309-
[return: NativeName(NativeNameType.Type, "void*")]
309+
[return: NativeName(NativeNameType.Type, "void *")]
310310
public static void* GetBufferPointer(this Blob blob)
311311
{
312312
void* ret = DirectXTex.BlobGetBufferPointerNative(blob);

0 commit comments

Comments
 (0)