From 608dabaeb1ad5f0460452517e76aebcfdc31834e Mon Sep 17 00:00:00 2001 From: Amer Koleci Date: Tue, 2 May 2023 17:16:27 +0200 Subject: [PATCH] [D3D12] Improvements and better MessageId name, bump version to 1.9.24 --- Directory.Build.props | 2 +- src/Generator/Program.cs | 24 +++++ src/Vortice.Win32.Graphics.Direct3D12/Box.cs | 2 +- .../Generated/Graphics.Direct3D12.Enums.cs | 102 +++++++++--------- .../QueryHeapDescription.Manual.cs | 14 +++ 5 files changed, 91 insertions(+), 53 deletions(-) create mode 100644 src/Vortice.Win32.Graphics.Direct3D12/QueryHeapDescription.Manual.cs diff --git a/Directory.Build.props b/Directory.Build.props index ff28145..1879163 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,7 +14,7 @@ true $(MSBuildThisFileDirectory)NuGet.config - 1.9.23 + 1.9.24 true diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs index 74f4dcf..965e83b 100644 --- a/src/Generator/Program.cs +++ b/src/Generator/Program.cs @@ -754,6 +754,30 @@ public static class Program "HrtfDirectivityCone", "HrtfDistanceDecay", "HrtfApoInit", + "CreatePipelinelibrary", + "InvalidLibraryBlob", + "DriverVersionMismatch", + "AdapterVersionMismatch", + "StorePipeline", + "LoadPipeline", + "DuplicateName", + "NameNotFound", + "NotEnoughMemory", + "SetEventOnMultipleFenceCompletion", + "SamplePositions", + "SetSamplePositions", + "VideoDecodeCommandQueue", + "VideoProcessCommandList", + "VideoDecoderHeap", + "VideoEncodeCommandList", + "VideoEncodeCommandQueue", + "CommandRecorder", + "CommandPool", + "CreatePlacedResourceOnBuffer", + "VideoMotionVectorHeap", + "CreateCommandList", + "BlendOp", + "BlendOpAlpha", }; private static readonly HashSet s_preserveCaps = new(StringComparer.OrdinalIgnoreCase) diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Box.cs b/src/Vortice.Win32.Graphics.Direct3D12/Box.cs index ff83ad0..70b9b4d 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Box.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Box.cs @@ -3,7 +3,7 @@ namespace Win32.Graphics.Direct3D12; -public unsafe partial struct Box : IEquatable +public partial struct Box : IEquatable { public Box(int left, int right) { diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Enums.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Enums.cs index 7df5339..4676e8f 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Enums.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Enums.cs @@ -5412,16 +5412,16 @@ public enum MessageId GpuBasedValidationRootDescriptorAccessOutOfBounds = 961, /// /// D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_INVALIDLIBRARYBLOB - CreatepipelinelibraryInvalidlibraryblob = 962, + CreatePipelinelibraryInvalidLibraryBlob = 962, /// /// D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_DRIVERVERSIONMISMATCH - CreatepipelinelibraryDriverversionmismatch = 963, + CreatePipelinelibraryDriverVersionMismatch = 963, /// /// D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_ADAPTERVERSIONMISMATCH - CreatepipelinelibraryAdapterversionmismatch = 964, + CreatePipelinelibraryAdapterVersionMismatch = 964, /// /// D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_UNSUPPORTED - CreatepipelinelibraryUnsupported = 965, + CreatePipelinelibraryUnsupported = 965, /// /// D3D12_MESSAGE_ID_CREATE_PIPELINELIBRARY CreatePipelinelibrary = 966, @@ -5433,25 +5433,25 @@ public enum MessageId DestroyPipelinelibrary = 968, /// /// D3D12_MESSAGE_ID_STOREPIPELINE_NONAME - StorepipelineNoname = 969, + StorePipelineNoname = 969, /// /// D3D12_MESSAGE_ID_STOREPIPELINE_DUPLICATENAME - StorepipelineDuplicatename = 970, + StorePipelineDuplicateName = 970, /// /// D3D12_MESSAGE_ID_LOADPIPELINE_NAMENOTFOUND - LoadpipelineNamenotfound = 971, + LoadPipelineNameNotFound = 971, /// /// D3D12_MESSAGE_ID_LOADPIPELINE_INVALIDDESC - LoadpipelineInvalidDesc = 972, + LoadPipelineInvalidDesc = 972, /// /// D3D12_MESSAGE_ID_PIPELINELIBRARY_SERIALIZE_NOTENOUGHMEMORY - PipelinelibrarySerializeNotenoughmemory = 973, + PipelinelibrarySerializeNotEnoughMemory = 973, /// /// D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_OUTPUT_RT_OUTPUT_MISMATCH CreateGraphicsPipelineStatePSOutputRtOutputMismatch = 974, /// /// D3D12_MESSAGE_ID_SETEVENTONMULTIPLEFENCECOMPLETION_INVALIDFLAGS - SeteventonmultiplefencecompletionInvalidFlags = 975, + SetEventOnMultipleFenceCompletionInvalidFlags = 975, /// /// D3D12_MESSAGE_ID_CREATE_QUEUE_VIDEO_NOT_SUPPORTED CreateQueueVideoNotSupported = 976, @@ -5664,34 +5664,34 @@ public enum MessageId ProgrammableMsaaUnsupported = 1048, /// /// D3D12_MESSAGE_ID_SETSAMPLEPOSITIONS_INVALIDARGS - SetsamplepositionsInvalidArgs = 1049, + SetSamplePositionsInvalidArgs = 1049, /// /// D3D12_MESSAGE_ID_RESOLVESUBRESOURCEREGION_INVALID_RECT ResolveSubresourceRegionInvalidRect = 1050, /// /// D3D12_MESSAGE_ID_CREATE_VIDEODECODECOMMANDQUEUE - CreateVideodecodecommandqueue = 1051, + CreateVideoDecodeCommandQueue = 1051, /// /// D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSCOMMANDLIST - CreateVideoprocesscommandlist = 1052, + CreateVideoProcessCommandList = 1052, /// /// D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSCOMMANDQUEUE CreateVideoProcessCommandQueue = 1053, /// /// D3D12_MESSAGE_ID_LIVE_VIDEODECODECOMMANDQUEUE - LiveVideodecodecommandqueue = 1054, + LiveVideoDecodeCommandQueue = 1054, /// /// D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSCOMMANDLIST - LiveVideoprocesscommandlist = 1055, + LiveVideoProcessCommandList = 1055, /// /// D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSCOMMANDQUEUE LiveVideoProcessCommandQueue = 1056, /// /// D3D12_MESSAGE_ID_DESTROY_VIDEODECODECOMMANDQUEUE - DestroyVideodecodecommandqueue = 1057, + DestroyVideoDecodeCommandQueue = 1057, /// /// D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSCOMMANDLIST - DestroyVideoprocesscommandlist = 1058, + DestroyVideoProcessCommandList = 1058, /// /// D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSCOMMANDQUEUE DestroyVideoProcessCommandQueue = 1059, @@ -5757,22 +5757,22 @@ public enum MessageId CreateQueryHeapCopyQueueTimestampsNotSupported = 1079, /// /// D3D12_MESSAGE_ID_SAMPLEPOSITIONS_MISMATCH_DEFERRED - SamplepositionsMismatchDeferred = 1080, + SamplePositionsMismatchDeferred = 1080, /// /// D3D12_MESSAGE_ID_SAMPLEPOSITIONS_MISMATCH_RECORDTIME_ASSUMEDFROMFIRSTUSE - SamplepositionsMismatchRecordtimeAssumedfromfirstuse = 1081, + SamplePositionsMismatchRecordtimeAssumedfromfirstuse = 1081, /// /// D3D12_MESSAGE_ID_SAMPLEPOSITIONS_MISMATCH_RECORDTIME_ASSUMEDFROMCLEAR - SamplepositionsMismatchRecordtimeAssumedfromclear = 1082, + SamplePositionsMismatchRecordtimeAssumedfromclear = 1082, /// /// D3D12_MESSAGE_ID_CREATE_VIDEODECODERHEAP - CreateVideodecoderheap = 1083, + CreateVideoDecoderHeap = 1083, /// /// D3D12_MESSAGE_ID_LIVE_VIDEODECODERHEAP - LiveVideodecoderheap = 1084, + LiveVideoDecoderHeap = 1084, /// /// D3D12_MESSAGE_ID_DESTROY_VIDEODECODERHEAP - DestroyVideodecoderheap = 1085, + DestroyVideoDecoderHeap = 1085, /// /// D3D12_MESSAGE_ID_OPENEXISTINGHEAP_INVALIDARG_RETURN OpenExistingHeapInvalidArgReturn = 1086, @@ -5862,13 +5862,13 @@ public enum MessageId VideoDecodeSupportUnsupported = 1114, /// /// D3D12_MESSAGE_ID_CREATE_COMMANDRECORDER - CreateCommandrecorder = 1115, + CreateCommandRecorder = 1115, /// /// D3D12_MESSAGE_ID_LIVE_COMMANDRECORDER - LiveCommandrecorder = 1116, + LiveCommandRecorder = 1116, /// /// D3D12_MESSAGE_ID_DESTROY_COMMANDRECORDER - DestroyCommandrecorder = 1117, + DestroyCommandRecorder = 1117, /// /// D3D12_MESSAGE_ID_CREATE_COMMAND_RECORDER_VIDEO_NOT_SUPPORTED CreateCommandRecorderVideoNotSupported = 1118, @@ -5883,13 +5883,13 @@ public enum MessageId CreateCommandRecorderMoreRecordersThanLogicalProcessors = 1121, /// /// D3D12_MESSAGE_ID_CREATE_COMMANDPOOL - CreateCommandpool = 1122, + CreateCommandPool = 1122, /// /// D3D12_MESSAGE_ID_LIVE_COMMANDPOOL - LiveCommandpool = 1123, + LiveCommandPool = 1123, /// /// D3D12_MESSAGE_ID_DESTROY_COMMANDPOOL - DestroyCommandpool = 1124, + DestroyCommandPool = 1124, /// /// D3D12_MESSAGE_ID_CREATE_COMMAND_POOL_INVALID_FLAGS CreateCommandPoolInvalidFlags = 1125, @@ -5904,7 +5904,7 @@ public enum MessageId CommandRecorderContention = 1128, /// /// D3D12_MESSAGE_ID_COMMAND_RECORDER_USAGE_WITH_CREATECOMMANDLIST_COMMAND_LIST - CommandRecorderUsageWithCreatecommandlistCommandList = 1129, + CommandRecorderUsageWithCreateCommandListCommandList = 1129, /// /// D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_USAGE_WITH_CREATECOMMANDLIST1_COMMAND_LIST CommandAllocatorUsageWithCreatecommandlist1CommandList = 1130, @@ -5949,31 +5949,31 @@ public enum MessageId AtomicCopyBufferInvalidSrcResource = 1143, /// /// D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_NULL_BUFFER - CreateplacedresourceonbufferNullBuffer = 1144, + CreatePlacedResourceOnBufferNullBuffer = 1144, /// /// D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_NULL_RESOURCE_DESC - CreateplacedresourceonbufferNullResourceDesc = 1145, + CreatePlacedResourceOnBufferNullResourceDesc = 1145, /// /// D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_UNSUPPORTED - CreateplacedresourceonbufferUnsupported = 1146, + CreatePlacedResourceOnBufferUnsupported = 1146, /// /// D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_BUFFER_DIMENSION - CreateplacedresourceonbufferInvalidBufferDimension = 1147, + CreatePlacedResourceOnBufferInvalidBufferDimension = 1147, /// /// D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_BUFFER_FLAGS - CreateplacedresourceonbufferInvalidBufferFlags = 1148, + CreatePlacedResourceOnBufferInvalidBufferFlags = 1148, /// /// D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_BUFFER_OFFSET - CreateplacedresourceonbufferInvalidBufferOffset = 1149, + CreatePlacedResourceOnBufferInvalidBufferOffset = 1149, /// /// D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_RESOURCE_DIMENSION - CreateplacedresourceonbufferInvalidResourceDimension = 1150, + CreatePlacedResourceOnBufferInvalidResourceDimension = 1150, /// /// D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_INVALID_RESOURCE_FLAGS - CreateplacedresourceonbufferInvalidResourceFlags = 1151, + CreatePlacedResourceOnBufferInvalidResourceFlags = 1151, /// /// D3D12_MESSAGE_ID_CREATEPLACEDRESOURCEONBUFFER_OUTOFMEMORY_RETURN - CreateplacedresourceonbufferOutOfMemoryReturn = 1152, + CreatePlacedResourceOnBufferOutOfMemoryReturn = 1152, /// /// D3D12_MESSAGE_ID_CANNOT_CREATE_GRAPHICS_AND_VIDEO_COMMAND_RECORDER CannotCreateGraphicsAndVideoCommandRecorder = 1153, @@ -6048,22 +6048,22 @@ public enum MessageId MetaCommandInvalidGpuVirtualAddress = 1176, /// /// D3D12_MESSAGE_ID_CREATE_VIDEOENCODECOMMANDLIST - CreateVideoencodecommandlist = 1177, + CreateVideoEncodeCommandList = 1177, /// /// D3D12_MESSAGE_ID_LIVE_VIDEOENCODECOMMANDLIST - LiveVideoencodecommandlist = 1178, + LiveVideoEncodeCommandList = 1178, /// /// D3D12_MESSAGE_ID_DESTROY_VIDEOENCODECOMMANDLIST - DestroyVideoencodecommandlist = 1179, + DestroyVideoEncodeCommandList = 1179, /// /// D3D12_MESSAGE_ID_CREATE_VIDEOENCODECOMMANDQUEUE - CreateVideoencodecommandqueue = 1180, + CreateVideoEncodeCommandQueue = 1180, /// /// D3D12_MESSAGE_ID_LIVE_VIDEOENCODECOMMANDQUEUE - LiveVideoencodecommandqueue = 1181, + LiveVideoEncodeCommandQueue = 1181, /// /// D3D12_MESSAGE_ID_DESTROY_VIDEOENCODECOMMANDQUEUE - DestroyVideoencodecommandqueue = 1182, + DestroyVideoEncodeCommandQueue = 1182, /// /// D3D12_MESSAGE_ID_CREATE_VIDEOMOTIONESTIMATOR CreateVideoMotionEstimator = 1183, @@ -6075,13 +6075,13 @@ public enum MessageId DestroyVideoMotionEstimator = 1185, /// /// D3D12_MESSAGE_ID_CREATE_VIDEOMOTIONVECTORHEAP - CreateVideomotionvectorheap = 1186, + CreateVideoMotionVectorHeap = 1186, /// /// D3D12_MESSAGE_ID_LIVE_VIDEOMOTIONVECTORHEAP - LiveVideomotionvectorheap = 1187, + LiveVideoMotionVectorHeap = 1187, /// /// D3D12_MESSAGE_ID_DESTROY_VIDEOMOTIONVECTORHEAP - DestroyVideomotionvectorheap = 1188, + DestroyVideoMotionVectorHeap = 1188, /// /// D3D12_MESSAGE_ID_MULTIPLE_TRACKED_WORKLOADS MultipleTrackedWorkloads = 1189, @@ -6456,7 +6456,7 @@ public enum MessageId CreateVideoEncoderHeapUnsupportedParameters = 1312, /// /// D3D12_MESSAGE_ID_CREATECOMMANDLIST_NULL_COMMANDALLOCATOR - CreatecommandlistNullCommandAllocator = 1313, + CreateCommandListNullCommandAllocator = 1313, /// /// D3D12_MESSAGE_ID_CLEAR_UNORDERED_ACCESS_VIEW_INVALID_DESCRIPTOR_HANDLE ClearUnorderedAccessViewInvalidDescriptorHandle = 1314, @@ -6465,10 +6465,10 @@ public enum MessageId DescriptorHeapNotShaderVisible = 1315, /// /// D3D12_MESSAGE_ID_CREATEBLENDSTATE_BLENDOP_WARNING - CreateBlendStateBlendopWarning = 1316, + CreateBlendStateBlendOpWarning = 1316, /// /// D3D12_MESSAGE_ID_CREATEBLENDSTATE_BLENDOPALPHA_WARNING - CreateBlendStateBlendopalphaWarning = 1317, + CreateBlendStateBlendOpAlphaWarning = 1317, /// /// D3D12_MESSAGE_ID_WRITE_COMBINE_PERFORMANCE_WARNING WriteCombinePerformanceWarning = 1318, diff --git a/src/Vortice.Win32.Graphics.Direct3D12/QueryHeapDescription.Manual.cs b/src/Vortice.Win32.Graphics.Direct3D12/QueryHeapDescription.Manual.cs new file mode 100644 index 0000000..7cc85b9 --- /dev/null +++ b/src/Vortice.Win32.Graphics.Direct3D12/QueryHeapDescription.Manual.cs @@ -0,0 +1,14 @@ +// Copyright © Amer Koleci and Contributors. +// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. + +namespace Win32.Graphics.Direct3D12; + +unsafe partial struct QueryHeapDescription +{ + public QueryHeapDescription(QueryHeapType type, uint count, uint nodeMask = 0) + { + Type = type; + Count = count; + NodeMask = nodeMask; + } +}