[PATCH 3/7] include: Convert dxgiformat.h to IDL.

Henri Verbeet hverbeet at codeweavers.com
Thu Sep 21 15:29:34 CDT 2017


Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
 include/dcommon.idl    |   2 +-
 include/dxgiformat.h   | 147 -------------------------------------------------
 include/dxgiformat.idl | 145 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/dxgitype.idl   |   2 +-
 4 files changed, 147 insertions(+), 149 deletions(-)
 delete mode 100644 include/dxgiformat.h
 create mode 100644 include/dxgiformat.idl

diff --git a/include/dcommon.idl b/include/dcommon.idl
index b77ec48..db5055d 100644
--- a/include/dcommon.idl
+++ b/include/dcommon.idl
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-import "dxgiformat.h";
+import "dxgiformat.idl";
 
 cpp_quote("#if 0")
 typedef struct
diff --git a/include/dxgiformat.h b/include/dxgiformat.h
deleted file mode 100644
index 4c315cb..0000000
--- a/include/dxgiformat.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2007 Andras Kovacs
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __dxgiformat_h__
-#define __dxgiformat_h__
-
-#define DXGI_FORMAT_DEFINED 1
-
-typedef enum DXGI_FORMAT {
-    DXGI_FORMAT_UNKNOWN                 = 0,
-    DXGI_FORMAT_R32G32B32A32_TYPELESS   = 1,
-    DXGI_FORMAT_R32G32B32A32_FLOAT      = 2,
-    DXGI_FORMAT_R32G32B32A32_UINT       = 3,
-    DXGI_FORMAT_R32G32B32A32_SINT       = 4,
-    DXGI_FORMAT_R32G32B32_TYPELESS      = 5,
-    DXGI_FORMAT_R32G32B32_FLOAT         = 6,
-    DXGI_FORMAT_R32G32B32_UINT          = 7,
-    DXGI_FORMAT_R32G32B32_SINT          = 8,
-    DXGI_FORMAT_R16G16B16A16_TYPELESS   = 9,
-    DXGI_FORMAT_R16G16B16A16_FLOAT      = 10,
-    DXGI_FORMAT_R16G16B16A16_UNORM      = 11,
-    DXGI_FORMAT_R16G16B16A16_UINT       = 12,
-    DXGI_FORMAT_R16G16B16A16_SNORM      = 13,
-    DXGI_FORMAT_R16G16B16A16_SINT       = 14,
-    DXGI_FORMAT_R32G32_TYPELESS         = 15,
-    DXGI_FORMAT_R32G32_FLOAT            = 16,
-    DXGI_FORMAT_R32G32_UINT             = 17,
-    DXGI_FORMAT_R32G32_SINT             = 18,
-    DXGI_FORMAT_R32G8X24_TYPELESS       = 19,
-    DXGI_FORMAT_D32_FLOAT_S8X24_UINT    = 20,
-    DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS= 21,
-    DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22,
-    DXGI_FORMAT_R10G10B10A2_TYPELESS    = 23,
-    DXGI_FORMAT_R10G10B10A2_UNORM       = 24,
-    DXGI_FORMAT_R10G10B10A2_UINT        = 25,
-    DXGI_FORMAT_R11G11B10_FLOAT         = 26,
-    DXGI_FORMAT_R8G8B8A8_TYPELESS       = 27,
-    DXGI_FORMAT_R8G8B8A8_UNORM          = 28,
-    DXGI_FORMAT_R8G8B8A8_UNORM_SRGB     = 29,
-    DXGI_FORMAT_R8G8B8A8_UINT           = 30,
-    DXGI_FORMAT_R8G8B8A8_SNORM          = 31,
-    DXGI_FORMAT_R8G8B8A8_SINT           = 32,
-    DXGI_FORMAT_R16G16_TYPELESS         = 33,
-    DXGI_FORMAT_R16G16_FLOAT            = 34,
-    DXGI_FORMAT_R16G16_UNORM            = 35,
-    DXGI_FORMAT_R16G16_UINT             = 36,
-    DXGI_FORMAT_R16G16_SNORM            = 37,
-    DXGI_FORMAT_R16G16_SINT             = 38,
-    DXGI_FORMAT_R32_TYPELESS            = 39,
-    DXGI_FORMAT_D32_FLOAT               = 40,
-    DXGI_FORMAT_R32_FLOAT               = 41,
-    DXGI_FORMAT_R32_UINT                = 42,
-    DXGI_FORMAT_R32_SINT                = 43,
-    DXGI_FORMAT_R24G8_TYPELESS          = 44,
-    DXGI_FORMAT_D24_UNORM_S8_UINT       = 45,
-    DXGI_FORMAT_R24_UNORM_X8_TYPELESS   = 46,
-    DXGI_FORMAT_X24_TYPELESS_G8_UINT    = 47,
-    DXGI_FORMAT_R8G8_TYPELESS           = 48,
-    DXGI_FORMAT_R8G8_UNORM              = 49,
-    DXGI_FORMAT_R8G8_UINT               = 50,
-    DXGI_FORMAT_R8G8_SNORM              = 51,
-    DXGI_FORMAT_R8G8_SINT               = 52,
-    DXGI_FORMAT_R16_TYPELESS            = 53,
-    DXGI_FORMAT_R16_FLOAT               = 54,
-    DXGI_FORMAT_D16_UNORM               = 55,
-    DXGI_FORMAT_R16_UNORM               = 56,
-    DXGI_FORMAT_R16_UINT                = 57,
-    DXGI_FORMAT_R16_SNORM               = 58,
-    DXGI_FORMAT_R16_SINT                = 59,
-    DXGI_FORMAT_R8_TYPELESS             = 60,
-    DXGI_FORMAT_R8_UNORM                = 61,
-    DXGI_FORMAT_R8_UINT                 = 62,
-    DXGI_FORMAT_R8_SNORM                = 63,
-    DXGI_FORMAT_R8_SINT                 = 64,
-    DXGI_FORMAT_A8_UNORM                = 65,
-    DXGI_FORMAT_R1_UNORM                = 66,
-    DXGI_FORMAT_R9G9B9E5_SHAREDEXP      = 67,
-    DXGI_FORMAT_R8G8_B8G8_UNORM         = 68,
-    DXGI_FORMAT_G8R8_G8B8_UNORM         = 69,
-    DXGI_FORMAT_BC1_TYPELESS            = 70,
-    DXGI_FORMAT_BC1_UNORM               = 71,
-    DXGI_FORMAT_BC1_UNORM_SRGB          = 72,
-    DXGI_FORMAT_BC2_TYPELESS            = 73,
-    DXGI_FORMAT_BC2_UNORM               = 74,
-    DXGI_FORMAT_BC2_UNORM_SRGB          = 75,
-    DXGI_FORMAT_BC3_TYPELESS            = 76,
-    DXGI_FORMAT_BC3_UNORM               = 77,
-    DXGI_FORMAT_BC3_UNORM_SRGB          = 78,
-    DXGI_FORMAT_BC4_TYPELESS            = 79,
-    DXGI_FORMAT_BC4_UNORM               = 80,
-    DXGI_FORMAT_BC4_SNORM               = 81,
-    DXGI_FORMAT_BC5_TYPELESS            = 82,
-    DXGI_FORMAT_BC5_UNORM               = 83,
-    DXGI_FORMAT_BC5_SNORM               = 84,
-    DXGI_FORMAT_B5G6R5_UNORM            = 85,
-    DXGI_FORMAT_B5G5R5A1_UNORM          = 86,
-    DXGI_FORMAT_B8G8R8A8_UNORM          = 87,
-    DXGI_FORMAT_B8G8R8X8_UNORM          = 88,
-    DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
-    DXGI_FORMAT_B8G8R8A8_TYPELESS       = 90,
-    DXGI_FORMAT_B8G8R8A8_UNORM_SRGB     = 91,
-    DXGI_FORMAT_B8G8R8X8_TYPELESS       = 92,
-    DXGI_FORMAT_B8G8R8X8_UNORM_SRGB     = 93,
-    DXGI_FORMAT_BC6H_TYPELESS           = 94,
-    DXGI_FORMAT_BC6H_UF16               = 95,
-    DXGI_FORMAT_BC6H_SF16               = 96,
-    DXGI_FORMAT_BC7_TYPELESS            = 97,
-    DXGI_FORMAT_BC7_UNORM               = 98,
-    DXGI_FORMAT_BC7_UNORM_SRGB          = 99,
-    DXGI_FORMAT_AYUV                    = 100,
-    DXGI_FORMAT_Y410                    = 101,
-    DXGI_FORMAT_Y416                    = 102,
-    DXGI_FORMAT_NV12                    = 103,
-    DXGI_FORMAT_P010                    = 104,
-    DXGI_FORMAT_P016                    = 105,
-    DXGI_FORMAT_420_OPAQUE              = 106,
-    DXGI_FORMAT_YUY2                    = 107,
-    DXGI_FORMAT_Y210                    = 108,
-    DXGI_FORMAT_Y216                    = 109,
-    DXGI_FORMAT_NV11                    = 110,
-    DXGI_FORMAT_AI44                    = 111,
-    DXGI_FORMAT_IA44                    = 112,
-    DXGI_FORMAT_P8                      = 113,
-    DXGI_FORMAT_A8P8                    = 114,
-    DXGI_FORMAT_B4G4R4A4_UNORM          = 115,
-    DXGI_FORMAT_P208                    = 130,
-    DXGI_FORMAT_V208                    = 131,
-    DXGI_FORMAT_V408                    = 132,
-    DXGI_FORMAT_FORCE_UINT              = 0xffffffff
-} DXGI_FORMAT;
-
-#endif
diff --git a/include/dxgiformat.idl b/include/dxgiformat.idl
new file mode 100644
index 0000000..5f85064
--- /dev/null
+++ b/include/dxgiformat.idl
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2016 Józef Kucia for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+const unsigned int DXGI_FORMAT_DEFINED = 1;
+
+typedef enum DXGI_FORMAT
+{
+    DXGI_FORMAT_UNKNOWN                     = 0x00,
+    DXGI_FORMAT_R32G32B32A32_TYPELESS       = 0x01,
+    DXGI_FORMAT_R32G32B32A32_FLOAT          = 0x02,
+    DXGI_FORMAT_R32G32B32A32_UINT           = 0x03,
+    DXGI_FORMAT_R32G32B32A32_SINT           = 0x04,
+    DXGI_FORMAT_R32G32B32_TYPELESS          = 0x05,
+    DXGI_FORMAT_R32G32B32_FLOAT             = 0x06,
+    DXGI_FORMAT_R32G32B32_UINT              = 0x07,
+    DXGI_FORMAT_R32G32B32_SINT              = 0x08,
+    DXGI_FORMAT_R16G16B16A16_TYPELESS       = 0x09,
+    DXGI_FORMAT_R16G16B16A16_FLOAT          = 0x0a,
+    DXGI_FORMAT_R16G16B16A16_UNORM          = 0x0b,
+    DXGI_FORMAT_R16G16B16A16_UINT           = 0x0c,
+    DXGI_FORMAT_R16G16B16A16_SNORM          = 0x0d,
+    DXGI_FORMAT_R16G16B16A16_SINT           = 0x0e,
+    DXGI_FORMAT_R32G32_TYPELESS             = 0x0f,
+    DXGI_FORMAT_R32G32_FLOAT                = 0x10,
+    DXGI_FORMAT_R32G32_UINT                 = 0x11,
+    DXGI_FORMAT_R32G32_SINT                 = 0x12,
+    DXGI_FORMAT_R32G8X24_TYPELESS           = 0x13,
+    DXGI_FORMAT_D32_FLOAT_S8X24_UINT        = 0x14,
+    DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS    = 0x15,
+    DXGI_FORMAT_X32_TYPELESS_G8X24_UINT     = 0x16,
+    DXGI_FORMAT_R10G10B10A2_TYPELESS        = 0x17,
+    DXGI_FORMAT_R10G10B10A2_UNORM           = 0x18,
+    DXGI_FORMAT_R10G10B10A2_UINT            = 0x19,
+    DXGI_FORMAT_R11G11B10_FLOAT             = 0x1a,
+    DXGI_FORMAT_R8G8B8A8_TYPELESS           = 0x1b,
+    DXGI_FORMAT_R8G8B8A8_UNORM              = 0x1c,
+    DXGI_FORMAT_R8G8B8A8_UNORM_SRGB         = 0x1d,
+    DXGI_FORMAT_R8G8B8A8_UINT               = 0x1e,
+    DXGI_FORMAT_R8G8B8A8_SNORM              = 0x1f,
+    DXGI_FORMAT_R8G8B8A8_SINT               = 0x20,
+    DXGI_FORMAT_R16G16_TYPELESS             = 0x21,
+    DXGI_FORMAT_R16G16_FLOAT                = 0x22,
+    DXGI_FORMAT_R16G16_UNORM                = 0x23,
+    DXGI_FORMAT_R16G16_UINT                 = 0x24,
+    DXGI_FORMAT_R16G16_SNORM                = 0x25,
+    DXGI_FORMAT_R16G16_SINT                 = 0x26,
+    DXGI_FORMAT_R32_TYPELESS                = 0x27,
+    DXGI_FORMAT_D32_FLOAT                   = 0x28,
+    DXGI_FORMAT_R32_FLOAT                   = 0x29,
+    DXGI_FORMAT_R32_UINT                    = 0x2a,
+    DXGI_FORMAT_R32_SINT                    = 0x2b,
+    DXGI_FORMAT_R24G8_TYPELESS              = 0x2c,
+    DXGI_FORMAT_D24_UNORM_S8_UINT           = 0x2d,
+    DXGI_FORMAT_R24_UNORM_X8_TYPELESS       = 0x2e,
+    DXGI_FORMAT_X24_TYPELESS_G8_UINT        = 0x2f,
+    DXGI_FORMAT_R8G8_TYPELESS               = 0x30,
+    DXGI_FORMAT_R8G8_UNORM                  = 0x31,
+    DXGI_FORMAT_R8G8_UINT                   = 0x32,
+    DXGI_FORMAT_R8G8_SNORM                  = 0x33,
+    DXGI_FORMAT_R8G8_SINT                   = 0x34,
+    DXGI_FORMAT_R16_TYPELESS                = 0x35,
+    DXGI_FORMAT_R16_FLOAT                   = 0x36,
+    DXGI_FORMAT_D16_UNORM                   = 0x37,
+    DXGI_FORMAT_R16_UNORM                   = 0x38,
+    DXGI_FORMAT_R16_UINT                    = 0x39,
+    DXGI_FORMAT_R16_SNORM                   = 0x3a,
+    DXGI_FORMAT_R16_SINT                    = 0x3b,
+    DXGI_FORMAT_R8_TYPELESS                 = 0x3c,
+    DXGI_FORMAT_R8_UNORM                    = 0x3d,
+    DXGI_FORMAT_R8_UINT                     = 0x3e,
+    DXGI_FORMAT_R8_SNORM                    = 0x3f,
+    DXGI_FORMAT_R8_SINT                     = 0x40,
+    DXGI_FORMAT_A8_UNORM                    = 0x41,
+    DXGI_FORMAT_R1_UNORM                    = 0x42,
+    DXGI_FORMAT_R9G9B9E5_SHAREDEXP          = 0x43,
+    DXGI_FORMAT_R8G8_B8G8_UNORM             = 0x44,
+    DXGI_FORMAT_G8R8_G8B8_UNORM             = 0x45,
+    DXGI_FORMAT_BC1_TYPELESS                = 0x46,
+    DXGI_FORMAT_BC1_UNORM                   = 0x47,
+    DXGI_FORMAT_BC1_UNORM_SRGB              = 0x48,
+    DXGI_FORMAT_BC2_TYPELESS                = 0x49,
+    DXGI_FORMAT_BC2_UNORM                   = 0x4a,
+    DXGI_FORMAT_BC2_UNORM_SRGB              = 0x4b,
+    DXGI_FORMAT_BC3_TYPELESS                = 0x4c,
+    DXGI_FORMAT_BC3_UNORM                   = 0x4d,
+    DXGI_FORMAT_BC3_UNORM_SRGB              = 0x4e,
+    DXGI_FORMAT_BC4_TYPELESS                = 0x4f,
+    DXGI_FORMAT_BC4_UNORM                   = 0x50,
+    DXGI_FORMAT_BC4_SNORM                   = 0x51,
+    DXGI_FORMAT_BC5_TYPELESS                = 0x52,
+    DXGI_FORMAT_BC5_UNORM                   = 0x53,
+    DXGI_FORMAT_BC5_SNORM                   = 0x54,
+    DXGI_FORMAT_B5G6R5_UNORM                = 0x55,
+    DXGI_FORMAT_B5G5R5A1_UNORM              = 0x56,
+    DXGI_FORMAT_B8G8R8A8_UNORM              = 0x57,
+    DXGI_FORMAT_B8G8R8X8_UNORM              = 0x58,
+    DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM  = 0x59,
+    DXGI_FORMAT_B8G8R8A8_TYPELESS           = 0x5a,
+    DXGI_FORMAT_B8G8R8A8_UNORM_SRGB         = 0x5b,
+    DXGI_FORMAT_B8G8R8X8_TYPELESS           = 0x5c,
+    DXGI_FORMAT_B8G8R8X8_UNORM_SRGB         = 0x5d,
+    DXGI_FORMAT_BC6H_TYPELESS               = 0x5e,
+    DXGI_FORMAT_BC6H_UF16                   = 0x5f,
+    DXGI_FORMAT_BC6H_SF16                   = 0x60,
+    DXGI_FORMAT_BC7_TYPELESS                = 0x61,
+    DXGI_FORMAT_BC7_UNORM                   = 0x62,
+    DXGI_FORMAT_BC7_UNORM_SRGB              = 0x63,
+    DXGI_FORMAT_AYUV                        = 0x64,
+    DXGI_FORMAT_Y410                        = 0x65,
+    DXGI_FORMAT_Y416                        = 0x66,
+    DXGI_FORMAT_NV12                        = 0x67,
+    DXGI_FORMAT_P010                        = 0x68,
+    DXGI_FORMAT_P016                        = 0x69,
+    DXGI_FORMAT_420_OPAQUE                  = 0x6a,
+    DXGI_FORMAT_YUY2                        = 0x6b,
+    DXGI_FORMAT_Y210                        = 0x6c,
+    DXGI_FORMAT_Y216                        = 0x6d,
+    DXGI_FORMAT_NV11                        = 0x6e,
+    DXGI_FORMAT_AI44                        = 0x6f,
+    DXGI_FORMAT_IA44                        = 0x70,
+    DXGI_FORMAT_P8                          = 0x71,
+    DXGI_FORMAT_A8P8                        = 0x72,
+    DXGI_FORMAT_B4G4R4A4_UNORM              = 0x73,
+
+    DXGI_FORMAT_P208                        = 0x82,
+    DXGI_FORMAT_V208                        = 0x83,
+    DXGI_FORMAT_V408                        = 0x84,
+
+    DXGI_FORMAT_FORCE_UINT                  = 0xffffffff,
+} DXGI_FORMAT;
diff --git a/include/dxgitype.idl b/include/dxgitype.idl
index 6e9ac9b..e7d2b43 100644
--- a/include/dxgitype.idl
+++ b/include/dxgitype.idl
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-import "dxgiformat.h";
+import "dxgiformat.idl";
 
 cpp_quote("#if 0")
 typedef unsigned int UINT;
-- 
2.1.4




More information about the wine-patches mailing list