diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5002453..16a104e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,4 +30,6 @@ jobs: - name: Publish to NuGet if: github.event_name == 'push' - run: dotnet nuget push artifacts/**/*.nupkg -k ${{secrets.NUGET_TOKEN}} --skip-duplicate --source https://api.nuget.org/v3/index.json + run: | + dotnet nuget push artifacts/package/release/*.nupkg -k ${{secrets.NUGET_TOKEN}} --skip-duplicate --source https://api.nuget.org/v3/index.json + dotnet nuget push artifacts/package/release/*.snupkg -k ${{secrets.NUGET_TOKEN}} --skip-duplicate --source https://api.nuget.org/v3/index.json diff --git a/Directory.Build.props b/Directory.Build.props index d69f95b..5f559af 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,6 +20,7 @@ latest enable enable + true false embedded strict @@ -40,16 +41,15 @@ MIT true $(RepositoryUrl) - $(MSBuildThisFileDirectory)artifacts/ - + - true + portable + true true - false + true snupkg - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs index 8e19e37..17c4a7c 100644 --- a/src/Generator/Program.cs +++ b/src/Generator/Program.cs @@ -829,6 +829,7 @@ public static class Program "VideoProcessorGetStreamColorSpace", "VideoProcessorGetStreamFrameFormat", "VideoProcessorSetStreamColorSpace", + "TriangleFan", }; private static readonly HashSet s_preserveCaps = new(StringComparer.OrdinalIgnoreCase) diff --git a/src/Vortice.Dxc.Native/LICENCE-MIT.txt b/src/Vortice.Dxc.Native/LICENSE-MIT.txt similarity index 100% rename from src/Vortice.Dxc.Native/LICENCE-MIT.txt rename to src/Vortice.Dxc.Native/LICENSE-MIT.txt diff --git a/src/Vortice.Dxc.Native/Vortice.Dxc.Native.csproj b/src/Vortice.Dxc.Native/Vortice.Dxc.Native.csproj index 002b018..99072af 100644 --- a/src/Vortice.Dxc.Native/Vortice.Dxc.Native.csproj +++ b/src/Vortice.Dxc.Native/Vortice.Dxc.Native.csproj @@ -3,18 +3,19 @@ netstandard2.0;net4.6.1;net8.0 Dxc native libraries - 1.0.1 + 1.0.2 false true LICENSE-MS.txt https://github.com/microsoft/DirectXShaderCompiler README.md + false - + diff --git a/src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxcompiler.so b/src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxcompiler.so index 1a16b8c..f45f399 100644 Binary files a/src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxcompiler.so and b/src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxcompiler.so differ diff --git a/src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxil.so b/src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxil.so index 8e48df8..a741553 100644 Binary files a/src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxil.so and b/src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxil.so differ diff --git a/src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxcompiler.dll b/src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxcompiler.dll index c58a542..1e1d3f3 100644 Binary files a/src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxcompiler.dll and b/src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxcompiler.dll differ diff --git a/src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxil.dll b/src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxil.dll index fc141cd..f27a1d0 100644 Binary files a/src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxil.dll and b/src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxil.dll differ diff --git a/src/Vortice.Dxc.Native/runtimes/win-x64/native/dxcompiler.dll b/src/Vortice.Dxc.Native/runtimes/win-x64/native/dxcompiler.dll index bbd0d5f..30e6f68 100644 Binary files a/src/Vortice.Dxc.Native/runtimes/win-x64/native/dxcompiler.dll and b/src/Vortice.Dxc.Native/runtimes/win-x64/native/dxcompiler.dll differ diff --git a/src/Vortice.Dxc.Native/runtimes/win-x64/native/dxil.dll b/src/Vortice.Dxc.Native/runtimes/win-x64/native/dxil.dll index 3d189e2..db5a1ce 100644 Binary files a/src/Vortice.Dxc.Native/runtimes/win-x64/native/dxil.dll and b/src/Vortice.Dxc.Native/runtimes/win-x64/native/dxil.dll differ diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D/Graphics.Direct3D.Apis.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D/Graphics.Direct3D.Apis.cs index 86651ce..d8c8e7d 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D/Graphics.Direct3D.Apis.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D/Graphics.Direct3D.Apis.cs @@ -281,7 +281,7 @@ public static partial class Apis public const PrimitiveTopology D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = PrimitiveTopology.LineStrip; public const PrimitiveTopology D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = PrimitiveTopology.TriangleList; public const PrimitiveTopology D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = PrimitiveTopology.TriangleStrip; - public const PrimitiveTopology D3D_PRIMITIVE_TOPOLOGY_TRIANGLEFAN = PrimitiveTopology.Trianglefan; + public const PrimitiveTopology D3D_PRIMITIVE_TOPOLOGY_TRIANGLEFAN = PrimitiveTopology.TriangleFan; public const PrimitiveTopology D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = PrimitiveTopology.LineListAdj; public const PrimitiveTopology D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = PrimitiveTopology.LineStripAdj; public const PrimitiveTopology D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = PrimitiveTopology.TriangleListAdj; diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D/Graphics.Direct3D.Enums.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D/Graphics.Direct3D.Enums.cs index 00a9b01..0095de2 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D/Graphics.Direct3D.Enums.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D/Graphics.Direct3D.Enums.cs @@ -99,7 +99,7 @@ public enum PrimitiveTopology TriangleStrip = 5, /// /// D3D_PRIMITIVE_TOPOLOGY_TRIANGLEFAN - Trianglefan = 6, + TriangleFan = 6, /// /// D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ LineListAdj = 10,