[PATCH] d3dcompiler: Add missing defines, enums and declarations.

[Andrey Gusev]

Signed-off-by: Andrey Gusev 
---
 include/d3dcompiler.h | 86 ++++++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 29 deletions(-)

diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h
index 70bdfa273f..2df149424a 100644
--- a/include/d3dcompiler.h
+++ b/include/d3dcompiler.h
@@ -34,34 +34,48 @@ static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e
 #define D3DCOMPILER_DLL_A  "d3dcompiler_47.dll"
 #define D3DCOMPILER_DLL    WINELIB_NAME_AW(D3DCOMPILER_DLL_)

-#define D3DCOMPILE_DEBUG                            0x00000001
-#define D3DCOMPILE_SKIP_VALIDATION                  0x00000002
-#define D3DCOMPILE_SKIP_OPTIMIZATION                0x00000004
-#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR            0x00000008
-#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR         0x00000010
-#define D3DCOMPILE_PARTIAL_PRECISION                0x00000020
-#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT         0x00000040
-#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT         0x00000080
-#define D3DCOMPILE_NO_PRESHADER                     0x00000100
-#define D3DCOMPILE_AVOID_FLOW_CONTROL               0x00000200
-#define D3DCOMPILE_PREFER_FLOW_CONTROL              0x00000400
-#define D3DCOMPILE_ENABLE_STRICTNESS                0x00000800
-#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY   0x00001000
-#define D3DCOMPILE_IEEE_STRICTNESS                  0x00002000
-#define D3DCOMPILE_OPTIMIZATION_LEVEL0              0x00004000
-#define D3DCOMPILE_OPTIMIZATION_LEVEL1              0x00000000
-#define D3DCOMPILE_OPTIMIZATION_LEVEL2              0x0000c000
-#define D3DCOMPILE_OPTIMIZATION_LEVEL3              0x00008000
-#define D3DCOMPILE_RESERVED16                       0x00010000
-#define D3DCOMPILE_RESERVED17                       0x00020000
-#define D3DCOMPILE_WARNINGS_ARE_ERRORS              0x00040000
-#define D3DCOMPILE_RESOURCES_MAY_ALIAS              0x00080000
-
-#define D3D_DISASM_ENABLE_COLOR_CODE                0x00000001
-#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS      0x00000002
-#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING     0x00000004
-#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE         0x00000008
-#define D3D_DISASM_DISABLE_DEBUG_INFO               0x00000010
+#define D3DCOMPILE_DEBUG                                0x00000001
+#define D3DCOMPILE_SKIP_VALIDATION                      0x00000002
+#define D3DCOMPILE_SKIP_OPTIMIZATION                    0x00000004
+#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR                0x00000008
+#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR             0x00000010
+#define D3DCOMPILE_PARTIAL_PRECISION                    0x00000020
+#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT             0x00000040
+#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT             0x00000080
+#define D3DCOMPILE_NO_PRESHADER                         0x00000100
+#define D3DCOMPILE_AVOID_FLOW_CONTROL                   0x00000200
+#define D3DCOMPILE_PREFER_FLOW_CONTROL                  0x00000400
+#define D3DCOMPILE_ENABLE_STRICTNESS                    0x00000800
+#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY       0x00001000
+#define D3DCOMPILE_IEEE_STRICTNESS                      0x00002000
+#define D3DCOMPILE_OPTIMIZATION_LEVEL0                  0x00004000
+#define D3DCOMPILE_OPTIMIZATION_LEVEL1                  0x00000000
+#define D3DCOMPILE_OPTIMIZATION_LEVEL2                  0x0000c000
+#define D3DCOMPILE_OPTIMIZATION_LEVEL3                  0x00008000
+#define D3DCOMPILE_RESERVED16                           0x00010000
+#define D3DCOMPILE_RESERVED17                           0x00020000
+#define D3DCOMPILE_WARNINGS_ARE_ERRORS                  0x00040000
+#define D3DCOMPILE_RESOURCES_MAY_ALIAS                  0x00080000
+#define D3DCOMPILE_ENABLE_UNBOUNDED_DESCRIPTOR_TABLES   0x00100000
+#define D3DCOMPILE_ALL_RESOURCES_BOUND                  0x00200000
+#define D3DCOMPILE_DEBUG_NAME_FOR_SOURCE                0x00400000
+#define D3DCOMPILE_DEBUG_NAME_FOR_BINARY                0x00800000
+
+#define D3DCOMPILE_EFFECT_CHILD_EFFECT                  0x00000001
+#define D3DCOMPILE_EFFECT_ALLOW_SLOW_OPS                0x00000002
+
+#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_LATEST   0x00000000
+#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_0      0x00000010
+#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_1      0x00000020
+
+#define D3D_DISASM_ENABLE_COLOR_CODE                    0x00000001
+#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS          0x00000002
+#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING         0x00000004
+#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE             0x00000008
+#define D3D_DISASM_DISABLE_DEBUG_INFO                   0x00000010
+#define D3D_DISASM_ENABLE_INSTRUCTION_OFFSET            0x00000020
+#define D3D_DISASM_INSTRUCTION_ONLY                     0x00000040
+#define D3D_DISASM_PRINT_HEX_LITERALS                   0x00000080

HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename,
         const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint,
@@ -69,12 +83,19 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena
 typedef HRESULT (WINAPI *pD3DCompile)(const void *data, SIZE_T data_size, const char *filename,
         const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint,
         const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages);
+HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename,
+        const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint,
+        const char *target, UINT sflags, UINT eflags, UINT secondary_flags,
+        const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader,
+        ID3DBlob **error_messages);

typedef enum D3DCOMPILER_STRIP_FLAGS
 {
     D3DCOMPILER_STRIP_REFLECTION_DATA = 1,
     D3DCOMPILER_STRIP_DEBUG_INFO = 2,
     D3DCOMPILER_STRIP_TEST_BLOBS = 4,
+    D3DCOMPILER_STRIP_PRIVATE_DATA = 8,
+    D3DCOMPILER_STRIP_ROOT_SIGNATURE = 10,
     D3DCOMPILER_STRIP_FORCE_DWORD = 0x7fffffff
 } D3DCOMPILER_STRIP_FLAGS;

@@ -91,15 +112,22 @@ typedef enum D3D_BLOB_PART
     D3D_BLOB_LEGACY_SHADER,
     D3D_BLOB_XNA_PREPASS_SHADER,
     D3D_BLOB_XNA_SHADER,
+    D3D_BLOB_PDB,
+    D3D_BLOB_PRIVATE_DATA,
+    D3D_BLOB_ROOT_SIGNATURE,
+    D3D_BLOB_DEBUG_NAME,
     D3D_BLOB_TEST_ALTERNATE_SHADER = 0x8000,
     D3D_BLOB_TEST_COMPILE_DETAILS,
-    D3D_BLOB_TEST_COMPILE_PERF
+    D3D_BLOB_TEST_COMPILE_PERF,
+    D3D_BLOB_TEST_COMPILE_REPORT
 } D3D_BLOB_PART;

HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size,
         UINT flags, const char *comments, ID3DBlob **disassembly);
 typedef HRESULT (WINAPI *pD3DDisassemble)(const void *data, SIZE_T data_size,
         UINT flags, const char *comments, ID3DBlob **disassembly);
+HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes,
+        const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors);
 HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob);
 HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob);
 HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob);

[Matteo Bruni]

On Fri, Oct 4, 2019 at 6:07 PM Andrey Gusev  wrote:
> typedef enum D3DCOMPILER_STRIP_FLAGS
>  {
>      D3DCOMPILER_STRIP_REFLECTION_DATA = 1,
>      D3DCOMPILER_STRIP_DEBUG_INFO = 2,
>      D3DCOMPILER_STRIP_TEST_BLOBS = 4,
> - D3DCOMPILER_STRIP_PRIVATE_DATA = 8,
> - D3DCOMPILER_STRIP_ROOT_SIGNATURE = 10,
> D3DCOMPILER_STRIP_FORCE_DWORD = 0x7fffffff
>
> } D3DCOMPILER_STRIP_FLAGS;

You want 0x10 there, or decimal 16. Probably better to use hex
literals in all these entries for consistency.

[Henri Verbeet]

On Fri, 4 Oct 2019 at 20:12, Matteo Bruni  wrote:
> On Fri, Oct 4, 2019 at 6:07 PM Andrey Gusev  wrote:
> > typedef enum D3DCOMPILER_STRIP_FLAGS
> >  {
> >      D3DCOMPILER_STRIP_REFLECTION_DATA = 1,
> >      D3DCOMPILER_STRIP_DEBUG_INFO = 2,
> >      D3DCOMPILER_STRIP_TEST_BLOBS = 4,
> > - D3DCOMPILER_STRIP_PRIVATE_DATA = 8,
> > - D3DCOMPILER_STRIP_ROOT_SIGNATURE = 10,
> > D3DCOMPILER_STRIP_FORCE_DWORD = 0x7fffffff
> >
> > } D3DCOMPILER_STRIP_FLAGS;
>
> You want 0x10 there, or decimal 16. Probably better to use hex
> literals in all these entries for consistency.

And well, sanity.