From 329416d510e90ff489b8c933827fcb8421f15080 Mon Sep 17 00:00:00 2001 From: Amer Koleci Date: Mon, 5 Sep 2022 10:45:47 +0200 Subject: [PATCH] More generation improvements. --- src/Generator/Program.cs | 94 +- .../Generated/Graphics/Direct3D.cs | 1081 ++--------------- 2 files changed, 218 insertions(+), 957 deletions(-) diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs index 98be557..00ce5eb 100644 --- a/src/Generator/Program.cs +++ b/src/Generator/Program.cs @@ -1,12 +1,7 @@ // Copyright © Amer Koleci and Contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. -using System.ComponentModel.DataAnnotations; using System.Text; -using System.Text.RegularExpressions; -using System.Xml; -using MessagePack; -using Microsoft.Windows.SDK.Win32Docs; using Newtonsoft.Json; namespace Generator; @@ -84,12 +79,43 @@ public static class Program { "DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS", "DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG" }, { "DXGI_DEBUG_RLO_FLAGS", "DXGI_DEBUG_RLO" }, { "DXGI_OFFER_RESOURCE_FLAGS", "DXGI_OFFER_RESOURCE_FLAG" }, + + // D3D + { "D3D_INTERPOLATION_MODE", "D3D_INTERPOLATION" }, + { "D3D_PARAMETER_FLAGS", "D3D" }, + { "D3D_TESSELLATOR_OUTPUT_PRIMITIVE", "D3D_TESSELLATOR_OUTPUT" }, + { "D3D_REGISTER_COMPONENT_TYPE", "D3D_REGISTER_COMPONENT" }, + { "D3D_RESOURCE_RETURN_TYPE", "D3D_RETURN_TYPE" }, + }; + + private static readonly Dictionary s_partRenames = new() + { + { "NONPREROTATED", "NonPrerotated" }, + { "POINTLIST", "PointList" }, + { "LINELIST", "LineList" }, + { "LINESTRIP", "LineStrip" }, + { "TRIANGLELIST", "TriangleList" }, + { "TRIANGLESTRIP", "TriangleStrip" }, + { "PATCHLIST", "PatchList" }, + + { "NOPERSPECTIVE", "NoPerspective" }, + { "TEXTURE1D", "Texture1D" }, + { "TEXTURE1DARRAY", "Texture1DArray" }, + { "TEXTURE2D", "Texture2D" }, + { "TEXTURE2DARRAY", "Texture2DArray" }, + { "TEXTURE2DMS", "Texture2DMs" }, + { "TEXTURE2DMSARRAY", "Texture2DMsArray" }, + { "TEXTURE3D", "Texture3D" }, + { "TEXTURECUBE", "TextureCube" }, + { "TEXTURECUBEARRAY", "TextureCubeArray" }, + { "BUFFEREX", "BufferExtended" }, }; private static readonly Dictionary s_knownEnumValueNames = new() { { "DXGI_FORMAT_420_OPAQUE", "Opaque420" }, { "DXGI_OUTDUPL_COMPOSITED_UI_CAPTURE_ONLY", "CompositedUICaptureOnly" }, + { "D3D_FEATURE_LEVEL_9_1", "Level_9_1" }, }; private static readonly Dictionary s_generatedEnums = new() @@ -105,7 +131,10 @@ public static class Program private static readonly HashSet s_ignoredParts = new(StringComparer.OrdinalIgnoreCase) { "DXGI", - "D3D" + "D3D", + "D3D10", + "D3D11", + "PF" // D3D_PF_ }; private static readonly HashSet s_preserveCaps = new(StringComparer.OrdinalIgnoreCase) @@ -399,10 +428,26 @@ public static class Program { if (value.Name.EndsWith("_FORCE_DWORD") || value.Name.EndsWith("_FORCE_UINT")) + { continue; + } + + // Ignore D3D10 and D3D11 in D3D + if (enumType.Name.StartsWith("D3D_")) + { + if (value.Name.StartsWith("D3D10_") || + value.Name.StartsWith("D3D11_")) + { + continue; + } + } string enumValueName = GetPrettyFieldName(value.Name, enumPrefix); + if (enumType.Name == "D3D_PRIMITIVE_TOPOLOGY") + { + } + if (!autoGenerated) { writer.WriteLine($"/// "); @@ -888,15 +933,36 @@ public static class Program return value; } + bool isFeatureLevel = enumPrefix == "D3D_FEATURE_LEVEL"; bool isDXGIFormat = enumPrefix == "DXGI_FORMAT"; string[] parts = value[enumPrefix.Length..].Split(new[] { '_' }, StringSplitOptions.RemoveEmptyEntries); - var sb = new StringBuilder(); + StringBuilder sb = new(); + + bool appendUnderscore = false; + if (isFeatureLevel) + { + sb.Append("Level").Append('_'); + appendUnderscore = true; + } + else if (enumPrefix == "D3D_PRIMITIVE_TOPOLOGY" + && value.EndsWith("_CONTROL_POINT_PATCHLIST")) + { + sb.Append('P'); + } + else if (enumPrefix == "D3D_PRIMITIVE" + && value.EndsWith("_CONTROL_POINT_PATCH")) + { + sb.Append('P'); + } + + int partIndex = 0; foreach (string part in parts) { if (s_ignoredParts.Contains(part)) { + partIndex++; continue; } @@ -979,9 +1045,9 @@ public static class Program } else { - if (part.Equals("NONPREROTATED", StringComparison.OrdinalIgnoreCase)) + if (s_partRenames.TryGetValue(part, out string? partRemap)) { - sb.Append("NonPrerotated"); + sb.Append(partRemap!); } else { @@ -993,6 +1059,16 @@ public static class Program } } } + + if (appendUnderscore) + { + if (partIndex < parts.Length - 1) + { + sb.Append('_'); + } + + partIndex++; + } } string prettyName = sb.ToString(); diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D.cs index d80833e..a6fe896 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D.cs @@ -107,37 +107,37 @@ public enum FeatureLevel : int { /// /// D3D_FEATURE_LEVEL_1_0_CORE - _10Core = 4096, + Level_1_0_Core = 4096, /// /// D3D_FEATURE_LEVEL_9_1 - _91 = 37120, + Level_9_1 = 37120, /// /// D3D_FEATURE_LEVEL_9_2 - _92 = 37376, + Level_9_2 = 37376, /// /// D3D_FEATURE_LEVEL_9_3 - _93 = 37632, + Level_9_3 = 37632, /// /// D3D_FEATURE_LEVEL_10_0 - _100 = 40960, + Level_10_0 = 40960, /// /// D3D_FEATURE_LEVEL_10_1 - _101 = 41216, + Level_10_1 = 41216, /// /// D3D_FEATURE_LEVEL_11_0 - _110 = 45056, + Level_11_0 = 45056, /// /// D3D_FEATURE_LEVEL_11_1 - _111 = 45312, + Level_11_1 = 45312, /// /// D3D_FEATURE_LEVEL_12_0 - _120 = 49152, + Level_12_0 = 49152, /// /// D3D_FEATURE_LEVEL_12_1 - _121 = 49408, + Level_12_1 = 49408, /// /// D3D_FEATURE_LEVEL_12_2 - _122 = 49664, + Level_12_2 = 49664, } /// @@ -149,283 +149,127 @@ public enum PrimitiveTopology : int Undefined = 0, /// /// D3D_PRIMITIVE_TOPOLOGY_POINTLIST - Pointlist = 1, + PointList = 1, /// /// D3D_PRIMITIVE_TOPOLOGY_LINELIST - Linelist = 2, + LineList = 2, /// /// D3D_PRIMITIVE_TOPOLOGY_LINESTRIP - Linestrip = 3, + LineStrip = 3, /// /// D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST - Trianglelist = 4, + TriangleList = 4, /// /// D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP - Trianglestrip = 5, + TriangleStrip = 5, /// /// D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ - LinelistAdj = 10, + LineListAdj = 10, /// /// D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ - LinestripAdj = 11, + LineStripAdj = 11, /// /// D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ - TrianglelistAdj = 12, + TriangleListAdj = 12, /// /// D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ - TrianglestripAdj = 13, + TriangleStripAdj = 13, /// /// D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST - _1ControlPointPatchlist = 33, + P1ControlPointPatchList = 33, /// /// D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST - _2ControlPointPatchlist = 34, + P2ControlPointPatchList = 34, /// /// D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST - _3ControlPointPatchlist = 35, + P3ControlPointPatchList = 35, /// /// D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST - _4ControlPointPatchlist = 36, + P4ControlPointPatchList = 36, /// /// D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST - _5ControlPointPatchlist = 37, + P5ControlPointPatchList = 37, /// /// D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST - _6ControlPointPatchlist = 38, + P6ControlPointPatchList = 38, /// /// D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST - _7ControlPointPatchlist = 39, + P7ControlPointPatchList = 39, /// /// D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST - _8ControlPointPatchlist = 40, + P8ControlPointPatchList = 40, /// /// D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST - _9ControlPointPatchlist = 41, + P9ControlPointPatchList = 41, /// /// D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST - _10ControlPointPatchlist = 42, + P10ControlPointPatchList = 42, /// /// D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST - _11ControlPointPatchlist = 43, + P11ControlPointPatchList = 43, /// /// D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST - _12ControlPointPatchlist = 44, + P12ControlPointPatchList = 44, /// /// D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST - _13ControlPointPatchlist = 45, + P13ControlPointPatchList = 45, /// /// D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST - _14ControlPointPatchlist = 46, + P14ControlPointPatchList = 46, /// /// D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST - _15ControlPointPatchlist = 47, + P15ControlPointPatchList = 47, /// /// D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST - _16ControlPointPatchlist = 48, + P16ControlPointPatchList = 48, /// /// D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST - _17ControlPointPatchlist = 49, + P17ControlPointPatchList = 49, /// /// D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST - _18ControlPointPatchlist = 50, + P18ControlPointPatchList = 50, /// /// D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST - _19ControlPointPatchlist = 51, + P19ControlPointPatchList = 51, /// /// D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST - _20ControlPointPatchlist = 52, + P20ControlPointPatchList = 52, /// /// D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST - _21ControlPointPatchlist = 53, + P21ControlPointPatchList = 53, /// /// D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST - _22ControlPointPatchlist = 54, + P22ControlPointPatchList = 54, /// /// D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST - _23ControlPointPatchlist = 55, + P23ControlPointPatchList = 55, /// /// D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST - _24ControlPointPatchlist = 56, + P24ControlPointPatchList = 56, /// /// D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST - _25ControlPointPatchlist = 57, + P25ControlPointPatchList = 57, /// /// D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST - _26ControlPointPatchlist = 58, + P26ControlPointPatchList = 58, /// /// D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST - _27ControlPointPatchlist = 59, + P27ControlPointPatchList = 59, /// /// D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST - _28ControlPointPatchlist = 60, + P28ControlPointPatchList = 60, /// /// D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST - _29ControlPointPatchlist = 61, + P29ControlPointPatchList = 61, /// /// D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST - _30ControlPointPatchlist = 62, + P30ControlPointPatchList = 62, /// /// D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST - _31ControlPointPatchlist = 63, + P31ControlPointPatchList = 63, /// /// D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST - _32ControlPointPatchlist = 64, - /// - /// D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED - D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, - /// - /// D3D10_PRIMITIVE_TOPOLOGY_POINTLIST - D3D10_PRIMITIVE_TOPOLOGY_POINTLIST = 1, - /// - /// D3D10_PRIMITIVE_TOPOLOGY_LINELIST - D3D10_PRIMITIVE_TOPOLOGY_LINELIST = 2, - /// - /// D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP - D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, - /// - /// D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST - D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, - /// - /// D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP - D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, - /// - /// D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ - D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10, - /// - /// D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ - D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11, - /// - /// D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ - D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12, - /// - /// D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ - D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED - D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_POINTLIST - D3D11_PRIMITIVE_TOPOLOGY_POINTLIST = 1, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_LINELIST - D3D11_PRIMITIVE_TOPOLOGY_LINELIST = 2, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP - D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST - D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP - D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ - D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ - D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ - D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ - D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST = 33, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST = 34, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST = 35, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST = 36, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST = 37, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST = 38, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST = 39, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST = 40, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST = 41, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST = 42, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST = 43, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST = 44, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST = 45, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST = 46, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST = 47, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST = 48, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST = 49, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST = 50, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST = 51, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST = 52, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST = 53, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST = 54, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST = 55, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST = 56, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST = 57, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST = 58, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST = 59, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST = 60, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST = 61, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST = 62, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST = 63, - /// - /// D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST - D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST = 64, + P32ControlPointPatchList = 64, } /// @@ -452,232 +296,100 @@ public enum Primitive : int TriangleAdj = 7, /// /// D3D_PRIMITIVE_1_CONTROL_POINT_PATCH - _1ControlPointPatch = 8, + P1ControlPointPatch = 8, /// /// D3D_PRIMITIVE_2_CONTROL_POINT_PATCH - _2ControlPointPatch = 9, + P2ControlPointPatch = 9, /// /// D3D_PRIMITIVE_3_CONTROL_POINT_PATCH - _3ControlPointPatch = 10, + P3ControlPointPatch = 10, /// /// D3D_PRIMITIVE_4_CONTROL_POINT_PATCH - _4ControlPointPatch = 11, + P4ControlPointPatch = 11, /// /// D3D_PRIMITIVE_5_CONTROL_POINT_PATCH - _5ControlPointPatch = 12, + P5ControlPointPatch = 12, /// /// D3D_PRIMITIVE_6_CONTROL_POINT_PATCH - _6ControlPointPatch = 13, + P6ControlPointPatch = 13, /// /// D3D_PRIMITIVE_7_CONTROL_POINT_PATCH - _7ControlPointPatch = 14, + P7ControlPointPatch = 14, /// /// D3D_PRIMITIVE_8_CONTROL_POINT_PATCH - _8ControlPointPatch = 15, + P8ControlPointPatch = 15, /// /// D3D_PRIMITIVE_9_CONTROL_POINT_PATCH - _9ControlPointPatch = 16, + P9ControlPointPatch = 16, /// /// D3D_PRIMITIVE_10_CONTROL_POINT_PATCH - _10ControlPointPatch = 17, + P10ControlPointPatch = 17, /// /// D3D_PRIMITIVE_11_CONTROL_POINT_PATCH - _11ControlPointPatch = 18, + P11ControlPointPatch = 18, /// /// D3D_PRIMITIVE_12_CONTROL_POINT_PATCH - _12ControlPointPatch = 19, + P12ControlPointPatch = 19, /// /// D3D_PRIMITIVE_13_CONTROL_POINT_PATCH - _13ControlPointPatch = 20, + P13ControlPointPatch = 20, /// /// D3D_PRIMITIVE_14_CONTROL_POINT_PATCH - _14ControlPointPatch = 21, + P14ControlPointPatch = 21, /// /// D3D_PRIMITIVE_15_CONTROL_POINT_PATCH - _15ControlPointPatch = 22, + P15ControlPointPatch = 22, /// /// D3D_PRIMITIVE_16_CONTROL_POINT_PATCH - _16ControlPointPatch = 23, + P16ControlPointPatch = 23, /// /// D3D_PRIMITIVE_17_CONTROL_POINT_PATCH - _17ControlPointPatch = 24, + P17ControlPointPatch = 24, /// /// D3D_PRIMITIVE_18_CONTROL_POINT_PATCH - _18ControlPointPatch = 25, + P18ControlPointPatch = 25, /// /// D3D_PRIMITIVE_19_CONTROL_POINT_PATCH - _19ControlPointPatch = 26, + P19ControlPointPatch = 26, /// /// D3D_PRIMITIVE_20_CONTROL_POINT_PATCH - _20ControlPointPatch = 27, + P20ControlPointPatch = 27, /// /// D3D_PRIMITIVE_21_CONTROL_POINT_PATCH - _21ControlPointPatch = 28, + P21ControlPointPatch = 28, /// /// D3D_PRIMITIVE_22_CONTROL_POINT_PATCH - _22ControlPointPatch = 29, + P22ControlPointPatch = 29, /// /// D3D_PRIMITIVE_23_CONTROL_POINT_PATCH - _23ControlPointPatch = 30, + P23ControlPointPatch = 30, /// /// D3D_PRIMITIVE_24_CONTROL_POINT_PATCH - _24ControlPointPatch = 31, + P24ControlPointPatch = 31, /// /// D3D_PRIMITIVE_25_CONTROL_POINT_PATCH - _25ControlPointPatch = 32, + P25ControlPointPatch = 32, /// /// D3D_PRIMITIVE_26_CONTROL_POINT_PATCH - _26ControlPointPatch = 33, + P26ControlPointPatch = 33, /// /// D3D_PRIMITIVE_27_CONTROL_POINT_PATCH - _27ControlPointPatch = 34, + P27ControlPointPatch = 34, /// /// D3D_PRIMITIVE_28_CONTROL_POINT_PATCH - _28ControlPointPatch = 35, + P28ControlPointPatch = 35, /// /// D3D_PRIMITIVE_29_CONTROL_POINT_PATCH - _29ControlPointPatch = 36, + P29ControlPointPatch = 36, /// /// D3D_PRIMITIVE_30_CONTROL_POINT_PATCH - _30ControlPointPatch = 37, + P30ControlPointPatch = 37, /// /// D3D_PRIMITIVE_31_CONTROL_POINT_PATCH - _31ControlPointPatch = 38, + P31ControlPointPatch = 38, /// /// D3D_PRIMITIVE_32_CONTROL_POINT_PATCH - _32ControlPointPatch = 39, - /// - /// D3D10_PRIMITIVE_UNDEFINED - D3D10_PRIMITIVE_UNDEFINED = 0, - /// - /// D3D10_PRIMITIVE_POINT - D3D10_PRIMITIVE_POINT = 1, - /// - /// D3D10_PRIMITIVE_LINE - D3D10_PRIMITIVE_LINE = 2, - /// - /// D3D10_PRIMITIVE_TRIANGLE - D3D10_PRIMITIVE_TRIANGLE = 3, - /// - /// D3D10_PRIMITIVE_LINE_ADJ - D3D10_PRIMITIVE_LINE_ADJ = 6, - /// - /// D3D10_PRIMITIVE_TRIANGLE_ADJ - D3D10_PRIMITIVE_TRIANGLE_ADJ = 7, - /// - /// D3D11_PRIMITIVE_UNDEFINED - D3D11_PRIMITIVE_UNDEFINED = 0, - /// - /// D3D11_PRIMITIVE_POINT - D3D11_PRIMITIVE_POINT = 1, - /// - /// D3D11_PRIMITIVE_LINE - D3D11_PRIMITIVE_LINE = 2, - /// - /// D3D11_PRIMITIVE_TRIANGLE - D3D11_PRIMITIVE_TRIANGLE = 3, - /// - /// D3D11_PRIMITIVE_LINE_ADJ - D3D11_PRIMITIVE_LINE_ADJ = 6, - /// - /// D3D11_PRIMITIVE_TRIANGLE_ADJ - D3D11_PRIMITIVE_TRIANGLE_ADJ = 7, - /// - /// D3D11_PRIMITIVE_1_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_1_CONTROL_POINT_PATCH = 8, - /// - /// D3D11_PRIMITIVE_2_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_2_CONTROL_POINT_PATCH = 9, - /// - /// D3D11_PRIMITIVE_3_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_3_CONTROL_POINT_PATCH = 10, - /// - /// D3D11_PRIMITIVE_4_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_4_CONTROL_POINT_PATCH = 11, - /// - /// D3D11_PRIMITIVE_5_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_5_CONTROL_POINT_PATCH = 12, - /// - /// D3D11_PRIMITIVE_6_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_6_CONTROL_POINT_PATCH = 13, - /// - /// D3D11_PRIMITIVE_7_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_7_CONTROL_POINT_PATCH = 14, - /// - /// D3D11_PRIMITIVE_8_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_8_CONTROL_POINT_PATCH = 15, - /// - /// D3D11_PRIMITIVE_9_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_9_CONTROL_POINT_PATCH = 16, - /// - /// D3D11_PRIMITIVE_10_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_10_CONTROL_POINT_PATCH = 17, - /// - /// D3D11_PRIMITIVE_11_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_11_CONTROL_POINT_PATCH = 18, - /// - /// D3D11_PRIMITIVE_12_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_12_CONTROL_POINT_PATCH = 19, - /// - /// D3D11_PRIMITIVE_13_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_13_CONTROL_POINT_PATCH = 20, - /// - /// D3D11_PRIMITIVE_14_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_14_CONTROL_POINT_PATCH = 21, - /// - /// D3D11_PRIMITIVE_15_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_15_CONTROL_POINT_PATCH = 22, - /// - /// D3D11_PRIMITIVE_16_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_16_CONTROL_POINT_PATCH = 23, - /// - /// D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH = 24, - /// - /// D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH = 25, - /// - /// D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH = 26, - /// - /// D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH = 27, - /// - /// D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH = 28, - /// - /// D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH = 29, - /// - /// D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH = 30, - /// - /// D3D11_PRIMITIVE_24_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_24_CONTROL_POINT_PATCH = 31, - /// - /// D3D11_PRIMITIVE_25_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_25_CONTROL_POINT_PATCH = 32, - /// - /// D3D11_PRIMITIVE_26_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_26_CONTROL_POINT_PATCH = 33, - /// - /// D3D11_PRIMITIVE_27_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_27_CONTROL_POINT_PATCH = 34, - /// - /// D3D11_PRIMITIVE_28_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_28_CONTROL_POINT_PATCH = 35, - /// - /// D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH = 36, - /// - /// D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH = 37, - /// - /// D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH = 38, - /// - /// D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH - D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH = 39, + P32ControlPointPatch = 39, } /// @@ -692,133 +404,34 @@ public enum SrvDimension : int Buffer = 1, /// /// D3D_SRV_DIMENSION_TEXTURE1D - Texture1d = 2, + Texture1D = 2, /// /// D3D_SRV_DIMENSION_TEXTURE1DARRAY - Texture1darray = 3, + Texture1DArray = 3, /// /// D3D_SRV_DIMENSION_TEXTURE2D - Texture2d = 4, + Texture2D = 4, /// /// D3D_SRV_DIMENSION_TEXTURE2DARRAY - Texture2darray = 5, + Texture2DArray = 5, /// /// D3D_SRV_DIMENSION_TEXTURE2DMS - Texture2dms = 6, + Texture2DMs = 6, /// /// D3D_SRV_DIMENSION_TEXTURE2DMSARRAY - Texture2dmsarray = 7, + Texture2DMsArray = 7, /// /// D3D_SRV_DIMENSION_TEXTURE3D - Texture3d = 8, + Texture3D = 8, /// /// D3D_SRV_DIMENSION_TEXTURECUBE - Texturecube = 9, + TextureCube = 9, /// /// D3D_SRV_DIMENSION_TEXTURECUBEARRAY - Texturecubearray = 10, + TextureCubeArray = 10, /// /// D3D_SRV_DIMENSION_BUFFEREX - Bufferex = 11, - /// - /// D3D10_SRV_DIMENSION_UNKNOWN - D3D10_SRV_DIMENSION_UNKNOWN = 0, - /// - /// D3D10_SRV_DIMENSION_BUFFER - D3D10_SRV_DIMENSION_BUFFER = 1, - /// - /// D3D10_SRV_DIMENSION_TEXTURE1D - D3D10_SRV_DIMENSION_TEXTURE1D = 2, - /// - /// D3D10_SRV_DIMENSION_TEXTURE1DARRAY - D3D10_SRV_DIMENSION_TEXTURE1DARRAY = 3, - /// - /// D3D10_SRV_DIMENSION_TEXTURE2D - D3D10_SRV_DIMENSION_TEXTURE2D = 4, - /// - /// D3D10_SRV_DIMENSION_TEXTURE2DARRAY - D3D10_SRV_DIMENSION_TEXTURE2DARRAY = 5, - /// - /// D3D10_SRV_DIMENSION_TEXTURE2DMS - D3D10_SRV_DIMENSION_TEXTURE2DMS = 6, - /// - /// D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY - D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY = 7, - /// - /// D3D10_SRV_DIMENSION_TEXTURE3D - D3D10_SRV_DIMENSION_TEXTURE3D = 8, - /// - /// D3D10_SRV_DIMENSION_TEXTURECUBE - D3D10_SRV_DIMENSION_TEXTURECUBE = 9, - /// - /// D3D10_1_SRV_DIMENSION_UNKNOWN - D3D10_1_SRV_DIMENSION_UNKNOWN = 0, - /// - /// D3D10_1_SRV_DIMENSION_BUFFER - D3D10_1_SRV_DIMENSION_BUFFER = 1, - /// - /// D3D10_1_SRV_DIMENSION_TEXTURE1D - D3D10_1_SRV_DIMENSION_TEXTURE1D = 2, - /// - /// D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY - D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY = 3, - /// - /// D3D10_1_SRV_DIMENSION_TEXTURE2D - D3D10_1_SRV_DIMENSION_TEXTURE2D = 4, - /// - /// D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY - D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY = 5, - /// - /// D3D10_1_SRV_DIMENSION_TEXTURE2DMS - D3D10_1_SRV_DIMENSION_TEXTURE2DMS = 6, - /// - /// D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY - D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY = 7, - /// - /// D3D10_1_SRV_DIMENSION_TEXTURE3D - D3D10_1_SRV_DIMENSION_TEXTURE3D = 8, - /// - /// D3D10_1_SRV_DIMENSION_TEXTURECUBE - D3D10_1_SRV_DIMENSION_TEXTURECUBE = 9, - /// - /// D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY - D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY = 10, - /// - /// D3D11_SRV_DIMENSION_UNKNOWN - D3D11_SRV_DIMENSION_UNKNOWN = 0, - /// - /// D3D11_SRV_DIMENSION_BUFFER - D3D11_SRV_DIMENSION_BUFFER = 1, - /// - /// D3D11_SRV_DIMENSION_TEXTURE1D - D3D11_SRV_DIMENSION_TEXTURE1D = 2, - /// - /// D3D11_SRV_DIMENSION_TEXTURE1DARRAY - D3D11_SRV_DIMENSION_TEXTURE1DARRAY = 3, - /// - /// D3D11_SRV_DIMENSION_TEXTURE2D - D3D11_SRV_DIMENSION_TEXTURE2D = 4, - /// - /// D3D11_SRV_DIMENSION_TEXTURE2DARRAY - D3D11_SRV_DIMENSION_TEXTURE2DARRAY = 5, - /// - /// D3D11_SRV_DIMENSION_TEXTURE2DMS - D3D11_SRV_DIMENSION_TEXTURE2DMS = 6, - /// - /// D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY - D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY = 7, - /// - /// D3D11_SRV_DIMENSION_TEXTURE3D - D3D11_SRV_DIMENSION_TEXTURE3D = 8, - /// - /// D3D11_SRV_DIMENSION_TEXTURECUBE - D3D11_SRV_DIMENSION_TEXTURECUBE = 9, - /// - /// D3D11_SRV_DIMENSION_TEXTURECUBEARRAY - D3D11_SRV_DIMENSION_TEXTURECUBEARRAY = 10, - /// - /// D3D11_SRV_DIMENSION_BUFFEREX - D3D11_SRV_DIMENSION_BUFFEREX = 11, + BufferExtended = 11, } /// @@ -831,12 +444,6 @@ public enum IncludeType : int /// /// D3D_INCLUDE_SYSTEM D3D_INCLUDE_SYSTEM = 1, - /// - /// D3D10_INCLUDE_LOCAL - D3D10_INCLUDE_LOCAL = 0, - /// - /// D3D10_INCLUDE_SYSTEM - D3D10_INCLUDE_SYSTEM = 1, } /// @@ -867,30 +474,6 @@ public enum ShaderVariableClass : int /// /// D3D_SVC_INTERFACE_POINTER D3D_SVC_INTERFACE_POINTER = 7, - /// - /// D3D10_SVC_SCALAR - D3D10_SVC_SCALAR = 0, - /// - /// D3D10_SVC_VECTOR - D3D10_SVC_VECTOR = 1, - /// - /// D3D10_SVC_MATRIX_ROWS - D3D10_SVC_MATRIX_ROWS = 2, - /// - /// D3D10_SVC_MATRIX_COLUMNS - D3D10_SVC_MATRIX_COLUMNS = 3, - /// - /// D3D10_SVC_OBJECT - D3D10_SVC_OBJECT = 4, - /// - /// D3D10_SVC_STRUCT - D3D10_SVC_STRUCT = 5, - /// - /// D3D11_SVC_INTERFACE_CLASS - D3D11_SVC_INTERFACE_CLASS = 6, - /// - /// D3D11_SVC_INTERFACE_POINTER - D3D11_SVC_INTERFACE_POINTER = 7, } /// @@ -909,18 +492,6 @@ public enum ShaderVariableFlags : int /// /// D3D_SVF_INTERFACE_PARAMETER D3D_SVF_INTERFACE_PARAMETER = 8, - /// - /// D3D10_SVF_USERPACKED - D3D10_SVF_USERPACKED = 1, - /// - /// D3D10_SVF_USED - D3D10_SVF_USED = 2, - /// - /// D3D11_SVF_INTERFACE_POINTER - D3D11_SVF_INTERFACE_POINTER = 4, - /// - /// D3D11_SVF_INTERFACE_PARAMETER - D3D11_SVF_INTERFACE_PARAMETER = 8, } /// @@ -1116,162 +687,6 @@ public enum ShaderVariableType : int /// /// D3D_SVT_UINT64 D3D_SVT_UINT64 = 62, - /// - /// D3D10_SVT_VOID - D3D10_SVT_VOID = 0, - /// - /// D3D10_SVT_BOOL - D3D10_SVT_BOOL = 1, - /// - /// D3D10_SVT_INT - D3D10_SVT_INT = 2, - /// - /// D3D10_SVT_FLOAT - D3D10_SVT_FLOAT = 3, - /// - /// D3D10_SVT_STRING - D3D10_SVT_STRING = 4, - /// - /// D3D10_SVT_TEXTURE - D3D10_SVT_TEXTURE = 5, - /// - /// D3D10_SVT_TEXTURE1D - D3D10_SVT_TEXTURE1D = 6, - /// - /// D3D10_SVT_TEXTURE2D - D3D10_SVT_TEXTURE2D = 7, - /// - /// D3D10_SVT_TEXTURE3D - D3D10_SVT_TEXTURE3D = 8, - /// - /// D3D10_SVT_TEXTURECUBE - D3D10_SVT_TEXTURECUBE = 9, - /// - /// D3D10_SVT_SAMPLER - D3D10_SVT_SAMPLER = 10, - /// - /// D3D10_SVT_SAMPLER1D - D3D10_SVT_SAMPLER1D = 11, - /// - /// D3D10_SVT_SAMPLER2D - D3D10_SVT_SAMPLER2D = 12, - /// - /// D3D10_SVT_SAMPLER3D - D3D10_SVT_SAMPLER3D = 13, - /// - /// D3D10_SVT_SAMPLERCUBE - D3D10_SVT_SAMPLERCUBE = 14, - /// - /// D3D10_SVT_PIXELSHADER - D3D10_SVT_PIXELSHADER = 15, - /// - /// D3D10_SVT_VERTEXSHADER - D3D10_SVT_VERTEXSHADER = 16, - /// - /// D3D10_SVT_PIXELFRAGMENT - D3D10_SVT_PIXELFRAGMENT = 17, - /// - /// D3D10_SVT_VERTEXFRAGMENT - D3D10_SVT_VERTEXFRAGMENT = 18, - /// - /// D3D10_SVT_UINT - D3D10_SVT_UINT = 19, - /// - /// D3D10_SVT_UINT8 - D3D10_SVT_UINT8 = 20, - /// - /// D3D10_SVT_GEOMETRYSHADER - D3D10_SVT_GEOMETRYSHADER = 21, - /// - /// D3D10_SVT_RASTERIZER - D3D10_SVT_RASTERIZER = 22, - /// - /// D3D10_SVT_DEPTHSTENCIL - D3D10_SVT_DEPTHSTENCIL = 23, - /// - /// D3D10_SVT_BLEND - D3D10_SVT_BLEND = 24, - /// - /// D3D10_SVT_BUFFER - D3D10_SVT_BUFFER = 25, - /// - /// D3D10_SVT_CBUFFER - D3D10_SVT_CBUFFER = 26, - /// - /// D3D10_SVT_TBUFFER - D3D10_SVT_TBUFFER = 27, - /// - /// D3D10_SVT_TEXTURE1DARRAY - D3D10_SVT_TEXTURE1DARRAY = 28, - /// - /// D3D10_SVT_TEXTURE2DARRAY - D3D10_SVT_TEXTURE2DARRAY = 29, - /// - /// D3D10_SVT_RENDERTARGETVIEW - D3D10_SVT_RENDERTARGETVIEW = 30, - /// - /// D3D10_SVT_DEPTHSTENCILVIEW - D3D10_SVT_DEPTHSTENCILVIEW = 31, - /// - /// D3D10_SVT_TEXTURE2DMS - D3D10_SVT_TEXTURE2DMS = 32, - /// - /// D3D10_SVT_TEXTURE2DMSARRAY - D3D10_SVT_TEXTURE2DMSARRAY = 33, - /// - /// D3D10_SVT_TEXTURECUBEARRAY - D3D10_SVT_TEXTURECUBEARRAY = 34, - /// - /// D3D11_SVT_HULLSHADER - D3D11_SVT_HULLSHADER = 35, - /// - /// D3D11_SVT_DOMAINSHADER - D3D11_SVT_DOMAINSHADER = 36, - /// - /// D3D11_SVT_INTERFACE_POINTER - D3D11_SVT_INTERFACE_POINTER = 37, - /// - /// D3D11_SVT_COMPUTESHADER - D3D11_SVT_COMPUTESHADER = 38, - /// - /// D3D11_SVT_DOUBLE - D3D11_SVT_DOUBLE = 39, - /// - /// D3D11_SVT_RWTEXTURE1D - D3D11_SVT_RWTEXTURE1D = 40, - /// - /// D3D11_SVT_RWTEXTURE1DARRAY - D3D11_SVT_RWTEXTURE1DARRAY = 41, - /// - /// D3D11_SVT_RWTEXTURE2D - D3D11_SVT_RWTEXTURE2D = 42, - /// - /// D3D11_SVT_RWTEXTURE2DARRAY - D3D11_SVT_RWTEXTURE2DARRAY = 43, - /// - /// D3D11_SVT_RWTEXTURE3D - D3D11_SVT_RWTEXTURE3D = 44, - /// - /// D3D11_SVT_RWBUFFER - D3D11_SVT_RWBUFFER = 45, - /// - /// D3D11_SVT_BYTEADDRESS_BUFFER - D3D11_SVT_BYTEADDRESS_BUFFER = 46, - /// - /// D3D11_SVT_RWBYTEADDRESS_BUFFER - D3D11_SVT_RWBYTEADDRESS_BUFFER = 47, - /// - /// D3D11_SVT_STRUCTURED_BUFFER - D3D11_SVT_STRUCTURED_BUFFER = 48, - /// - /// D3D11_SVT_RWSTRUCTURED_BUFFER - D3D11_SVT_RWSTRUCTURED_BUFFER = 49, - /// - /// D3D11_SVT_APPEND_STRUCTURED_BUFFER - D3D11_SVT_APPEND_STRUCTURED_BUFFER = 50, - /// - /// D3D11_SVT_CONSUME_STRUCTURED_BUFFER - D3D11_SVT_CONSUME_STRUCTURED_BUFFER = 51, } /// @@ -1296,21 +711,6 @@ public enum ShaderInputFlags : int /// /// D3D_SIF_UNUSED D3D_SIF_UNUSED = 16, - /// - /// D3D10_SIF_USERPACKED - D3D10_SIF_USERPACKED = 1, - /// - /// D3D10_SIF_COMPARISON_SAMPLER - D3D10_SIF_COMPARISON_SAMPLER = 2, - /// - /// D3D10_SIF_TEXTURE_COMPONENT_0 - D3D10_SIF_TEXTURE_COMPONENT_0 = 4, - /// - /// D3D10_SIF_TEXTURE_COMPONENT_1 - D3D10_SIF_TEXTURE_COMPONENT_1 = 8, - /// - /// D3D10_SIF_TEXTURE_COMPONENTS - D3D10_SIF_TEXTURE_COMPONENTS = 12, } /// @@ -1359,42 +759,6 @@ public enum ShaderInputType : int /// /// D3D_SIT_UAV_FEEDBACKTEXTURE D3D_SIT_UAV_FEEDBACKTEXTURE = 13, - /// - /// D3D10_SIT_CBUFFER - D3D10_SIT_CBUFFER = 0, - /// - /// D3D10_SIT_TBUFFER - D3D10_SIT_TBUFFER = 1, - /// - /// D3D10_SIT_TEXTURE - D3D10_SIT_TEXTURE = 2, - /// - /// D3D10_SIT_SAMPLER - D3D10_SIT_SAMPLER = 3, - /// - /// D3D11_SIT_UAV_RWTYPED - D3D11_SIT_UAV_RWTYPED = 4, - /// - /// D3D11_SIT_STRUCTURED - D3D11_SIT_STRUCTURED = 5, - /// - /// D3D11_SIT_UAV_RWSTRUCTURED - D3D11_SIT_UAV_RWSTRUCTURED = 6, - /// - /// D3D11_SIT_BYTEADDRESS - D3D11_SIT_BYTEADDRESS = 7, - /// - /// D3D11_SIT_UAV_RWBYTEADDRESS - D3D11_SIT_UAV_RWBYTEADDRESS = 8, - /// - /// D3D11_SIT_UAV_APPEND_STRUCTURED - D3D11_SIT_UAV_APPEND_STRUCTURED = 9, - /// - /// D3D11_SIT_UAV_CONSUME_STRUCTURED - D3D11_SIT_UAV_CONSUME_STRUCTURED = 10, - /// - /// D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER - D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER = 11, } /// @@ -1404,9 +768,6 @@ public enum ShaderCbufferFlags : int /// /// D3D_CBF_USERPACKED D3D_CBF_USERPACKED = 1, - /// - /// D3D10_CBF_USERPACKED - D3D10_CBF_USERPACKED = 1, } /// @@ -1425,24 +786,6 @@ public enum CbufferType : int /// /// D3D_CT_RESOURCE_BIND_INFO D3D_CT_RESOURCE_BIND_INFO = 3, - /// - /// D3D10_CT_CBUFFER - D3D10_CT_CBUFFER = 0, - /// - /// D3D10_CT_TBUFFER - D3D10_CT_TBUFFER = 1, - /// - /// D3D11_CT_CBUFFER - D3D11_CT_CBUFFER = 0, - /// - /// D3D11_CT_TBUFFER - D3D11_CT_TBUFFER = 1, - /// - /// D3D11_CT_INTERFACE_POINTERS - D3D11_CT_INTERFACE_POINTERS = 2, - /// - /// D3D11_CT_RESOURCE_BIND_INFO - D3D11_CT_RESOURCE_BIND_INFO = 3, } /// @@ -1530,78 +873,6 @@ public enum Name : int /// /// D3D_NAME_INNER_COVERAGE InnerCoverage = 70, - /// - /// D3D10_NAME_UNDEFINED - D3D10_NAME_UNDEFINED = 0, - /// - /// D3D10_NAME_POSITION - D3D10_NAME_POSITION = 1, - /// - /// D3D10_NAME_CLIP_DISTANCE - D3D10_NAME_CLIP_DISTANCE = 2, - /// - /// D3D10_NAME_CULL_DISTANCE - D3D10_NAME_CULL_DISTANCE = 3, - /// - /// D3D10_NAME_RENDER_TARGET_ARRAY_INDEX - D3D10_NAME_RENDER_TARGET_ARRAY_INDEX = 4, - /// - /// D3D10_NAME_VIEWPORT_ARRAY_INDEX - D3D10_NAME_VIEWPORT_ARRAY_INDEX = 5, - /// - /// D3D10_NAME_VERTEX_ID - D3D10_NAME_VERTEX_ID = 6, - /// - /// D3D10_NAME_PRIMITIVE_ID - D3D10_NAME_PRIMITIVE_ID = 7, - /// - /// D3D10_NAME_INSTANCE_ID - D3D10_NAME_INSTANCE_ID = 8, - /// - /// D3D10_NAME_IS_FRONT_FACE - D3D10_NAME_IS_FRONT_FACE = 9, - /// - /// D3D10_NAME_SAMPLE_INDEX - D3D10_NAME_SAMPLE_INDEX = 10, - /// - /// D3D10_NAME_TARGET - D3D10_NAME_TARGET = 64, - /// - /// D3D10_NAME_DEPTH - D3D10_NAME_DEPTH = 65, - /// - /// D3D10_NAME_COVERAGE - D3D10_NAME_COVERAGE = 66, - /// - /// D3D11_NAME_FINAL_QUAD_EDGE_TESSFACTOR - D3D11_NAME_FINAL_QUAD_EDGE_TESSFACTOR = 11, - /// - /// D3D11_NAME_FINAL_QUAD_INSIDE_TESSFACTOR - D3D11_NAME_FINAL_QUAD_INSIDE_TESSFACTOR = 12, - /// - /// D3D11_NAME_FINAL_TRI_EDGE_TESSFACTOR - D3D11_NAME_FINAL_TRI_EDGE_TESSFACTOR = 13, - /// - /// D3D11_NAME_FINAL_TRI_INSIDE_TESSFACTOR - D3D11_NAME_FINAL_TRI_INSIDE_TESSFACTOR = 14, - /// - /// D3D11_NAME_FINAL_LINE_DETAIL_TESSFACTOR - D3D11_NAME_FINAL_LINE_DETAIL_TESSFACTOR = 15, - /// - /// D3D11_NAME_FINAL_LINE_DENSITY_TESSFACTOR - D3D11_NAME_FINAL_LINE_DENSITY_TESSFACTOR = 16, - /// - /// D3D11_NAME_DEPTH_GREATER_EQUAL - D3D11_NAME_DEPTH_GREATER_EQUAL = 67, - /// - /// D3D11_NAME_DEPTH_LESS_EQUAL - D3D11_NAME_DEPTH_LESS_EQUAL = 68, - /// - /// D3D11_NAME_STENCIL_REF - D3D11_NAME_STENCIL_REF = 69, - /// - /// D3D11_NAME_INNER_COVERAGE - D3D11_NAME_INNER_COVERAGE = 70, /// /// D3D12_NAME_BARYCENTRICS D3D12_NAME_BARYCENTRICS = 23, @@ -1619,70 +890,28 @@ public enum ResourceReturnType : int { /// /// D3D_RETURN_TYPE_UNORM - D3D_RETURN_TYPE_UNORM = 1, + Unorm = 1, /// /// D3D_RETURN_TYPE_SNORM - D3D_RETURN_TYPE_SNORM = 2, + Snorm = 2, /// /// D3D_RETURN_TYPE_SINT - D3D_RETURN_TYPE_SINT = 3, + Sint = 3, /// /// D3D_RETURN_TYPE_UINT - D3D_RETURN_TYPE_UINT = 4, + Uint = 4, /// /// D3D_RETURN_TYPE_FLOAT - D3D_RETURN_TYPE_FLOAT = 5, + Float = 5, /// /// D3D_RETURN_TYPE_MIXED - D3D_RETURN_TYPE_MIXED = 6, + Mixed = 6, /// /// D3D_RETURN_TYPE_DOUBLE - D3D_RETURN_TYPE_DOUBLE = 7, + Double = 7, /// /// D3D_RETURN_TYPE_CONTINUED - D3D_RETURN_TYPE_CONTINUED = 8, - /// - /// D3D10_RETURN_TYPE_UNORM - D3D10_RETURN_TYPE_UNORM = 1, - /// - /// D3D10_RETURN_TYPE_SNORM - D3D10_RETURN_TYPE_SNORM = 2, - /// - /// D3D10_RETURN_TYPE_SINT - D3D10_RETURN_TYPE_SINT = 3, - /// - /// D3D10_RETURN_TYPE_UINT - D3D10_RETURN_TYPE_UINT = 4, - /// - /// D3D10_RETURN_TYPE_FLOAT - D3D10_RETURN_TYPE_FLOAT = 5, - /// - /// D3D10_RETURN_TYPE_MIXED - D3D10_RETURN_TYPE_MIXED = 6, - /// - /// D3D11_RETURN_TYPE_UNORM - D3D11_RETURN_TYPE_UNORM = 1, - /// - /// D3D11_RETURN_TYPE_SNORM - D3D11_RETURN_TYPE_SNORM = 2, - /// - /// D3D11_RETURN_TYPE_SINT - D3D11_RETURN_TYPE_SINT = 3, - /// - /// D3D11_RETURN_TYPE_UINT - D3D11_RETURN_TYPE_UINT = 4, - /// - /// D3D11_RETURN_TYPE_FLOAT - D3D11_RETURN_TYPE_FLOAT = 5, - /// - /// D3D11_RETURN_TYPE_MIXED - D3D11_RETURN_TYPE_MIXED = 6, - /// - /// D3D11_RETURN_TYPE_DOUBLE - D3D11_RETURN_TYPE_DOUBLE = 7, - /// - /// D3D11_RETURN_TYPE_CONTINUED - D3D11_RETURN_TYPE_CONTINUED = 8, + Continued = 8, } /// @@ -1691,28 +920,16 @@ public enum RegisterComponentType : int { /// /// D3D_REGISTER_COMPONENT_UNKNOWN - D3D_REGISTER_COMPONENT_UNKNOWN = 0, + Unknown = 0, /// /// D3D_REGISTER_COMPONENT_UINT32 - D3D_REGISTER_COMPONENT_UINT32 = 1, + Uint32 = 1, /// /// D3D_REGISTER_COMPONENT_SINT32 - D3D_REGISTER_COMPONENT_SINT32 = 2, + Sint32 = 2, /// /// D3D_REGISTER_COMPONENT_FLOAT32 - D3D_REGISTER_COMPONENT_FLOAT32 = 3, - /// - /// D3D10_REGISTER_COMPONENT_UNKNOWN - D3D10_REGISTER_COMPONENT_UNKNOWN = 0, - /// - /// D3D10_REGISTER_COMPONENT_UINT32 - D3D10_REGISTER_COMPONENT_UINT32 = 1, - /// - /// D3D10_REGISTER_COMPONENT_SINT32 - D3D10_REGISTER_COMPONENT_SINT32 = 2, - /// - /// D3D10_REGISTER_COMPONENT_FLOAT32 - D3D10_REGISTER_COMPONENT_FLOAT32 = 3, + Float32 = 3, } /// @@ -1731,18 +948,6 @@ public enum TessellatorDomain : int /// /// D3D_TESSELLATOR_DOMAIN_QUAD Quad = 3, - /// - /// D3D11_TESSELLATOR_DOMAIN_UNDEFINED - D3D11_TESSELLATOR_DOMAIN_UNDEFINED = 0, - /// - /// D3D11_TESSELLATOR_DOMAIN_ISOLINE - D3D11_TESSELLATOR_DOMAIN_ISOLINE = 1, - /// - /// D3D11_TESSELLATOR_DOMAIN_TRI - D3D11_TESSELLATOR_DOMAIN_TRI = 2, - /// - /// D3D11_TESSELLATOR_DOMAIN_QUAD - D3D11_TESSELLATOR_DOMAIN_QUAD = 3, } /// @@ -1764,21 +969,6 @@ public enum TessellatorPartitioning : int /// /// D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN FractionalEven = 4, - /// - /// D3D11_TESSELLATOR_PARTITIONING_UNDEFINED - D3D11_TESSELLATOR_PARTITIONING_UNDEFINED = 0, - /// - /// D3D11_TESSELLATOR_PARTITIONING_INTEGER - D3D11_TESSELLATOR_PARTITIONING_INTEGER = 1, - /// - /// D3D11_TESSELLATOR_PARTITIONING_POW2 - D3D11_TESSELLATOR_PARTITIONING_POW2 = 2, - /// - /// D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD - D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3, - /// - /// D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN - D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4, } /// @@ -1787,34 +977,19 @@ public enum TessellatorOutputPrimitive : int { /// /// D3D_TESSELLATOR_OUTPUT_UNDEFINED - D3D_TESSELLATOR_OUTPUT_UNDEFINED = 0, + Undefined = 0, /// /// D3D_TESSELLATOR_OUTPUT_POINT - D3D_TESSELLATOR_OUTPUT_POINT = 1, + Point = 1, /// /// D3D_TESSELLATOR_OUTPUT_LINE - D3D_TESSELLATOR_OUTPUT_LINE = 2, + Line = 2, /// /// D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW - D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW = 3, + TriangleCw = 3, /// /// D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW - D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4, - /// - /// D3D11_TESSELLATOR_OUTPUT_UNDEFINED - D3D11_TESSELLATOR_OUTPUT_UNDEFINED = 0, - /// - /// D3D11_TESSELLATOR_OUTPUT_POINT - D3D11_TESSELLATOR_OUTPUT_POINT = 1, - /// - /// D3D11_TESSELLATOR_OUTPUT_LINE - D3D11_TESSELLATOR_OUTPUT_LINE = 2, - /// - /// D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CW - D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CW = 3, - /// - /// D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW - D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4, + TriangleCcw = 4, } /// @@ -1853,28 +1028,28 @@ public enum InterpolationMode : int { /// /// D3D_INTERPOLATION_UNDEFINED - D3D_INTERPOLATION_UNDEFINED = 0, + Undefined = 0, /// /// D3D_INTERPOLATION_CONSTANT - D3D_INTERPOLATION_CONSTANT = 1, + Constant = 1, /// /// D3D_INTERPOLATION_LINEAR - D3D_INTERPOLATION_LINEAR = 2, + Linear = 2, /// /// D3D_INTERPOLATION_LINEAR_CENTROID - D3D_INTERPOLATION_LINEAR_CENTROID = 3, + LinearCentroid = 3, /// /// D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE - D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE = 4, + LinearNoPerspective = 4, /// /// D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID - D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID = 5, + LinearNoPerspectiveCentroid = 5, /// /// D3D_INTERPOLATION_LINEAR_SAMPLE - D3D_INTERPOLATION_LINEAR_SAMPLE = 6, + LinearSample = 6, /// /// D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE - D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE = 7, + LinearNoPerspectiveSample = 7, } /// @@ -1883,13 +1058,13 @@ public enum ParameterFlags : int { /// /// D3D_PF_NONE - D3D_PF_NONE = 0, + None = 0, /// /// D3D_PF_IN - D3D_PF_IN = 1, + In = 1, /// /// D3D_PF_OUT - D3D_PF_OUT = 2, + Out = 2, } #endregion Enums @@ -2064,7 +1239,17 @@ public unsafe partial struct ID3DDestructionNotifier : ID3DDestructionNotifier.I return ((delegate* unmanaged[Stdcall])(lpVtbl[2]))((IUnknown*)Unsafe.AsPointer(ref this)); } - + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + [VtblIndex(3)] + public HResult RegisterDestructionCallback(PFN_DESTRUCTION_CALLBACK callbackFn, void* pData, uint* pCallbackID) + { +#if NET6_0_OR_GREATER + return ((delegate* unmanaged)(lpVtbl[3]))((ID3DDestructionNotifier*)Unsafe.AsPointer(ref this), callbackFn, pData, pCallbackID); +#else + return ((delegate* unmanaged[Stdcall])(lpVtbl[3]))((ID3DDestructionNotifier*)Unsafe.AsPointer(ref this), callbackFn, pData, pCallbackID); +#endif + } /// [MethodImpl(MethodImplOptions.AggressiveInlining)]