Skip to content

Commit 946c4e3

Browse files
BeyleyBeyley
committed
Make d3d9 use the D3DColorValue from DXGI
While this is a breaking change, it effects approximately 0 people
1 parent 6521fac commit 946c4e3

39 files changed

+1077
-1149
lines changed

‎build/cache/d3d9.json.gz‎

0 Bytes
Binary file not shown.

‎generator.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,8 @@
17531753
"exclude": [
17541754
"__AnonymousRecord_d3d9types_L93_C9",
17551755
"__AnonymousRecord_d3d9types_L92_C5",
1756-
"_D3DMATRIX"
1756+
"_D3DMATRIX",
1757+
"_D3DCOLORVALUE"
17571758
],
17581759
"rename": {
17591760
"_D3D_OMAC": "D3DOMac"
@@ -2114,7 +2115,6 @@
21142115
"D2D_MATRIX_3X2_F": "Silk.NET.Maths.Matrix3X2<float>",
21152116
"D2D_RECT_F": "Silk.NET.Maths.Rectangle<float>",
21162117
"D3DMATRIX": "Silk.NET.Maths.Matrix4X4<float>",
2117-
"_D3DCOLORVALUE": "Silk.NET.DXGI.D3Dcolorvalue",
21182118
"DXGI_RATIONAL": "Silk.NET.DXGI.Rational",
21192119
"DXGI_ALPHA_MODE": "Silk.NET.DXGI.AlphaMode",
21202120
"DXGI_HDR_METADATA_TYPE": "Silk.NET.DXGI.HdrMetadataType",

‎src/Microsoft/Silk.NET.Direct3D9/D3D9.gen.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,17 +1369,17 @@ public unsafe partial class D3D9 : NativeAPI
13691369
/// <summary>To be documented.</summary>
13701370
[NativeName("Src", "Line 315, Column 12 in d3d9.h")]
13711371
[NativeApi(EntryPoint = "D3DPERF_BeginEvent")]
1372-
public unsafe partial int PERFBeginEvent(uint col, [Flow(FlowDirection.In)] char* wszName);
1372+
public unsafe partial int PERFBeginEvent(uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In)] char* wszName);
13731373

13741374
/// <summary>To be documented.</summary>
13751375
[NativeName("Src", "Line 315, Column 12 in d3d9.h")]
13761376
[NativeApi(EntryPoint = "D3DPERF_BeginEvent")]
1377-
public partial int PERFBeginEvent(uint col, [Flow(FlowDirection.In)] in char wszName);
1377+
public partial int PERFBeginEvent(uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In)] in char wszName);
13781378

13791379
/// <summary>To be documented.</summary>
13801380
[NativeName("Src", "Line 315, Column 12 in d3d9.h")]
13811381
[NativeApi(EntryPoint = "D3DPERF_BeginEvent")]
1382-
public partial int PERFBeginEvent(uint col, [Flow(FlowDirection.In), UnmanagedType(Silk.NET.Core.Native.UnmanagedType.LPWStr)] string wszName);
1382+
public partial int PERFBeginEvent(uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In), UnmanagedType(Silk.NET.Core.Native.UnmanagedType.LPWStr)] string wszName);
13831383

13841384
/// <summary>To be documented.</summary>
13851385
[NativeName("Src", "Line 316, Column 12 in d3d9.h")]
@@ -1389,32 +1389,32 @@ public unsafe partial class D3D9 : NativeAPI
13891389
/// <summary>To be documented.</summary>
13901390
[NativeName("Src", "Line 317, Column 13 in d3d9.h")]
13911391
[NativeApi(EntryPoint = "D3DPERF_SetMarker")]
1392-
public unsafe partial void PERFSetMarker(uint col, [Flow(FlowDirection.In)] char* wszName);
1392+
public unsafe partial void PERFSetMarker(uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In)] char* wszName);
13931393

13941394
/// <summary>To be documented.</summary>
13951395
[NativeName("Src", "Line 317, Column 13 in d3d9.h")]
13961396
[NativeApi(EntryPoint = "D3DPERF_SetMarker")]
1397-
public partial void PERFSetMarker(uint col, [Flow(FlowDirection.In)] in char wszName);
1397+
public partial void PERFSetMarker(uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In)] in char wszName);
13981398

13991399
/// <summary>To be documented.</summary>
14001400
[NativeName("Src", "Line 317, Column 13 in d3d9.h")]
14011401
[NativeApi(EntryPoint = "D3DPERF_SetMarker")]
1402-
public partial void PERFSetMarker(uint col, [Flow(FlowDirection.In), UnmanagedType(Silk.NET.Core.Native.UnmanagedType.LPWStr)] string wszName);
1402+
public partial void PERFSetMarker(uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In), UnmanagedType(Silk.NET.Core.Native.UnmanagedType.LPWStr)] string wszName);
14031403

14041404
/// <summary>To be documented.</summary>
14051405
[NativeName("Src", "Line 318, Column 13 in d3d9.h")]
14061406
[NativeApi(EntryPoint = "D3DPERF_SetRegion")]
1407-
public unsafe partial void PERFSetRegion(uint col, [Flow(FlowDirection.In)] char* wszName);
1407+
public unsafe partial void PERFSetRegion(uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In)] char* wszName);
14081408

14091409
/// <summary>To be documented.</summary>
14101410
[NativeName("Src", "Line 318, Column 13 in d3d9.h")]
14111411
[NativeApi(EntryPoint = "D3DPERF_SetRegion")]
1412-
public partial void PERFSetRegion(uint col, [Flow(FlowDirection.In)] in char wszName);
1412+
public partial void PERFSetRegion(uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In)] in char wszName);
14131413

14141414
/// <summary>To be documented.</summary>
14151415
[NativeName("Src", "Line 318, Column 13 in d3d9.h")]
14161416
[NativeApi(EntryPoint = "D3DPERF_SetRegion")]
1417-
public partial void PERFSetRegion(uint col, [Flow(FlowDirection.In), UnmanagedType(Silk.NET.Core.Native.UnmanagedType.LPWStr)] string wszName);
1417+
public partial void PERFSetRegion(uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In), UnmanagedType(Silk.NET.Core.Native.UnmanagedType.LPWStr)] string wszName);
14181418

14191419
/// <summary>To be documented.</summary>
14201420
[NativeName("Src", "Line 319, Column 13 in d3d9.h")]

‎src/Microsoft/Silk.NET.Direct3D9/D3D9Overloads.gen.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ public static class D3D9Overloads
1818
{
1919
/// <summary>To be documented.</summary>
2020
[NativeName("Src", "Line 315, Column 12 in d3d9.h")]
21-
public static unsafe int PERFBeginEvent(this D3D9 thisApi, uint col, [Flow(FlowDirection.In)] ReadOnlySpan<char> wszName)
21+
public static unsafe int PERFBeginEvent(this D3D9 thisApi, uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In)] ReadOnlySpan<char> wszName)
2222
{
2323
// SpanOverloader
2424
return thisApi.PERFBeginEvent(col, in wszName.GetPinnableReference());
2525
}
2626

2727
/// <summary>To be documented.</summary>
2828
[NativeName("Src", "Line 317, Column 13 in d3d9.h")]
29-
public static unsafe void PERFSetMarker(this D3D9 thisApi, uint col, [Flow(FlowDirection.In)] ReadOnlySpan<char> wszName)
29+
public static unsafe void PERFSetMarker(this D3D9 thisApi, uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In)] ReadOnlySpan<char> wszName)
3030
{
3131
// SpanOverloader
3232
thisApi.PERFSetMarker(col, in wszName.GetPinnableReference());
3333
}
3434

3535
/// <summary>To be documented.</summary>
3636
[NativeName("Src", "Line 318, Column 13 in d3d9.h")]
37-
public static unsafe void PERFSetRegion(this D3D9 thisApi, uint col, [Flow(FlowDirection.In)] ReadOnlySpan<char> wszName)
37+
public static unsafe void PERFSetRegion(this D3D9 thisApi, uint col, [Flow(Silk.NET.Core.Native.FlowDirection.In)] ReadOnlySpan<char> wszName)
3838
{
3939
// SpanOverloader
4040
thisApi.PERFSetRegion(col, in wszName.GetPinnableReference());

‎src/Microsoft/Silk.NET.Direct3D9/Structs/Colorvalue.gen.cs‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎src/Microsoft/Silk.NET.Direct3D9/Structs/Direct3D9ExVtblExtensions.gen.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public static unsafe int CreateDevice(this ComPtr<IDirect3D9Ex> thisVtbl, uint A
322322
}
323323

324324
/// <summary>To be documented.</summary>
325-
public static unsafe uint GetAdapterModeCountEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(FlowDirection.In)] Displaymodefilter* pFilter)
325+
public static unsafe uint GetAdapterModeCountEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(Silk.NET.Core.Native.FlowDirection.In)] Displaymodefilter* pFilter)
326326
{
327327
var @this = thisVtbl.Handle;
328328
uint ret = default;
@@ -331,7 +331,7 @@ public static unsafe uint GetAdapterModeCountEx(this ComPtr<IDirect3D9Ex> thisVt
331331
}
332332

333333
/// <summary>To be documented.</summary>
334-
public static uint GetAdapterModeCountEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(FlowDirection.In)] in Displaymodefilter pFilter)
334+
public static uint GetAdapterModeCountEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(Silk.NET.Core.Native.FlowDirection.In)] in Displaymodefilter pFilter)
335335
{
336336
var @this = thisVtbl.Handle;
337337
uint ret = default;
@@ -343,7 +343,7 @@ public static uint GetAdapterModeCountEx(this ComPtr<IDirect3D9Ex> thisVtbl, uin
343343
}
344344

345345
/// <summary>To be documented.</summary>
346-
public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(FlowDirection.In)] Displaymodefilter* pFilter, uint Mode, Displaymodeex* pMode)
346+
public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(Silk.NET.Core.Native.FlowDirection.In)] Displaymodefilter* pFilter, uint Mode, Displaymodeex* pMode)
347347
{
348348
var @this = thisVtbl.Handle;
349349
int ret = default;
@@ -352,7 +352,7 @@ public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl,
352352
}
353353

354354
/// <summary>To be documented.</summary>
355-
public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(FlowDirection.In)] Displaymodefilter* pFilter, uint Mode, ref Displaymodeex pMode)
355+
public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(Silk.NET.Core.Native.FlowDirection.In)] Displaymodefilter* pFilter, uint Mode, ref Displaymodeex pMode)
356356
{
357357
var @this = thisVtbl.Handle;
358358
int ret = default;
@@ -364,7 +364,7 @@ public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl,
364364
}
365365

366366
/// <summary>To be documented.</summary>
367-
public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(FlowDirection.In)] in Displaymodefilter pFilter, uint Mode, Displaymodeex* pMode)
367+
public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(Silk.NET.Core.Native.FlowDirection.In)] in Displaymodefilter pFilter, uint Mode, Displaymodeex* pMode)
368368
{
369369
var @this = thisVtbl.Handle;
370370
int ret = default;
@@ -376,7 +376,7 @@ public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl,
376376
}
377377

378378
/// <summary>To be documented.</summary>
379-
public static int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(FlowDirection.In)] in Displaymodefilter pFilter, uint Mode, ref Displaymodeex pMode)
379+
public static int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(Silk.NET.Core.Native.FlowDirection.In)] in Displaymodefilter pFilter, uint Mode, ref Displaymodeex pMode)
380380
{
381381
var @this = thisVtbl.Handle;
382382
int ret = default;
@@ -673,31 +673,31 @@ public static unsafe int CreateDevice(this ComPtr<IDirect3D9Ex> thisVtbl, uint A
673673
}
674674

675675
/// <summary>To be documented.</summary>
676-
public static uint GetAdapterModeCountEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(FlowDirection.In)] ReadOnlySpan<Displaymodefilter> pFilter)
676+
public static uint GetAdapterModeCountEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(Silk.NET.Core.Native.FlowDirection.In)] ReadOnlySpan<Displaymodefilter> pFilter)
677677
{
678678
var @this = thisVtbl.Handle;
679679
// SpanOverloader
680680
return @this->GetAdapterModeCountEx(Adapter, in pFilter.GetPinnableReference());
681681
}
682682

683683
/// <summary>To be documented.</summary>
684-
public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(FlowDirection.In)] Displaymodefilter* pFilter, uint Mode, Span<Displaymodeex> pMode)
684+
public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(Silk.NET.Core.Native.FlowDirection.In)] Displaymodefilter* pFilter, uint Mode, Span<Displaymodeex> pMode)
685685
{
686686
var @this = thisVtbl.Handle;
687687
// SpanOverloader
688688
return @this->EnumAdapterModesEx(Adapter, pFilter, Mode, ref pMode.GetPinnableReference());
689689
}
690690

691691
/// <summary>To be documented.</summary>
692-
public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(FlowDirection.In)] ReadOnlySpan<Displaymodefilter> pFilter, uint Mode, Displaymodeex* pMode)
692+
public static unsafe int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(Silk.NET.Core.Native.FlowDirection.In)] ReadOnlySpan<Displaymodefilter> pFilter, uint Mode, Displaymodeex* pMode)
693693
{
694694
var @this = thisVtbl.Handle;
695695
// SpanOverloader
696696
return @this->EnumAdapterModesEx(Adapter, in pFilter.GetPinnableReference(), Mode, pMode);
697697
}
698698

699699
/// <summary>To be documented.</summary>
700-
public static int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(FlowDirection.In)] ReadOnlySpan<Displaymodefilter> pFilter, uint Mode, Span<Displaymodeex> pMode)
700+
public static int EnumAdapterModesEx(this ComPtr<IDirect3D9Ex> thisVtbl, uint Adapter, [Flow(Silk.NET.Core.Native.FlowDirection.In)] ReadOnlySpan<Displaymodefilter> pFilter, uint Mode, Span<Displaymodeex> pMode)
701701
{
702702
var @this = thisVtbl.Handle;
703703
// SpanOverloader

0 commit comments

Comments
 (0)