Merge pull request Laupetin#83 from Laupetin/feature/fix-menu-dumps-m…

…istakes Fix smaller menu dumping mistakes
JezuzLizard · Jan 7, 2024 · 48d320c · 48d320c
2 parents e7e1899 + 034809c
commit 48d320c
Show file tree

Hide file tree

Showing 19 changed files with 474 additions and 281 deletions.
diff --git a/src/Common/Image/D3DFormat.h b/src/Common/Image/D3DFormat.h
@@ -2,107 +2,111 @@
 
 #include "Utils/FileUtils.h"
 
-enum D3DFORMAT
+// This is a redefinition to make this enum available on platforms without DirectX headers
+namespace oat
 {
-    D3DFMT_UNKNOWN = 0,
-
-    D3DFMT_R8G8B8 = 20,
-    D3DFMT_A8R8G8B8 = 21,
-    D3DFMT_X8R8G8B8 = 22,
-    D3DFMT_R5G6B5 = 23,
-    D3DFMT_X1R5G5B5 = 24,
-    D3DFMT_A1R5G5B5 = 25,
-    D3DFMT_A4R4G4B4 = 26,
-    D3DFMT_R3G3B2 = 27,
-    D3DFMT_A8 = 28,
-    D3DFMT_A8R3G3B2 = 29,
-    D3DFMT_X4R4G4B4 = 30,
-    D3DFMT_A2B10G10R10 = 31,
-    D3DFMT_A8B8G8R8 = 32,
-    D3DFMT_X8B8G8R8 = 33,
-    D3DFMT_G16R16 = 34,
-    D3DFMT_A2R10G10B10 = 35,
-    D3DFMT_A16B16G16R16 = 36,
-
-    D3DFMT_A8P8 = 40,
-    D3DFMT_P8 = 41,
-
-    D3DFMT_L8 = 50,
-    D3DFMT_A8L8 = 51,
-    D3DFMT_A4L4 = 52,
-
-    D3DFMT_V8U8 = 60,
-    D3DFMT_L6V5U5 = 61,
-    D3DFMT_X8L8V8U8 = 62,
-    D3DFMT_Q8W8V8U8 = 63,
-    D3DFMT_V16U16 = 64,
-    D3DFMT_A2W10V10U10 = 67,
-
-    D3DFMT_UYVY = FileUtils::MakeMagic32('U', 'Y', 'V', 'Y'),
-    D3DFMT_R8G8_B8G8 = FileUtils::MakeMagic32('R', 'G', 'B', 'G'),
-    D3DFMT_YUY2 = FileUtils::MakeMagic32('Y', 'U', 'Y', '2'),
-    D3DFMT_G8R8_G8B8 = FileUtils::MakeMagic32('G', 'R', 'G', 'B'),
-    D3DFMT_DXT1 = FileUtils::MakeMagic32('D', 'X', 'T', '1'),
-    D3DFMT_DXT2 = FileUtils::MakeMagic32('D', 'X', 'T', '2'),
-    D3DFMT_DXT3 = FileUtils::MakeMagic32('D', 'X', 'T', '3'),
-    D3DFMT_DXT4 = FileUtils::MakeMagic32('D', 'X', 'T', '4'),
-    D3DFMT_DXT5 = FileUtils::MakeMagic32('D', 'X', 'T', '5'),
-
-    D3DFMT_D16_LOCKABLE = 70,
-    D3DFMT_D32 = 71,
-    D3DFMT_D15S1 = 73,
-    D3DFMT_D24S8 = 75,
-    D3DFMT_D24X8 = 77,
-    D3DFMT_D24X4S4 = 79,
-    D3DFMT_D16 = 80,
-
-    D3DFMT_D32F_LOCKABLE = 82,
-    D3DFMT_D24FS8 = 83,
-
-    /* D3D9Ex only -- */
-
-    /* Z-Stencil formats valid for CPU access */
-    D3DFMT_D32_LOCKABLE = 84,
-    D3DFMT_S8_LOCKABLE = 85,
-
-    /* -- D3D9Ex only */
-
-    D3DFMT_L16 = 81,
-
-    D3DFMT_VERTEXDATA = 100,
-    D3DFMT_INDEX16 = 101,
-    D3DFMT_INDEX32 = 102,
-
-    D3DFMT_Q16W16V16U16 = 110,
-
-    D3DFMT_MULTI2_ARGB8 = FileUtils::MakeMagic32('M', 'E', 'T', '1'),
-
-    // Floating point surface formats
-
-    // s10e5 formats (16-bits per channel)
-    D3DFMT_R16F = 111,
-    D3DFMT_G16R16F = 112,
-    D3DFMT_A16B16G16R16F = 113,
-
-    // IEEE s23e8 formats (32-bits per channel)
-    D3DFMT_R32F = 114,
-    D3DFMT_G32R32F = 115,
-    D3DFMT_A32B32G32R32F = 116,
-
-    D3DFMT_CxV8U8 = 117,
-
-    /* D3D9Ex only -- */
-
-    // Monochrome 1 bit per pixel format
-    D3DFMT_A1 = 118,
-
-    // 2.8 biased fixed point
-    D3DFMT_A2B10G10R10_XR_BIAS = 119,
-
-    // Binary format indicating that the data has no inherent type
-    D3DFMT_BINARYBUFFER = 199,
-
-    /* -- D3D9Ex only */
-
-    D3DFMT_FORCE_DWORD = 0x7fffffff
-};
+    enum D3DFORMAT
+    {
+        D3DFMT_UNKNOWN = 0,
+
+        D3DFMT_R8G8B8 = 20,
+        D3DFMT_A8R8G8B8 = 21,
+        D3DFMT_X8R8G8B8 = 22,
+        D3DFMT_R5G6B5 = 23,
+        D3DFMT_X1R5G5B5 = 24,
+        D3DFMT_A1R5G5B5 = 25,
+        D3DFMT_A4R4G4B4 = 26,
+        D3DFMT_R3G3B2 = 27,
+        D3DFMT_A8 = 28,
+        D3DFMT_A8R3G3B2 = 29,
+        D3DFMT_X4R4G4B4 = 30,
+        D3DFMT_A2B10G10R10 = 31,
+        D3DFMT_A8B8G8R8 = 32,
+        D3DFMT_X8B8G8R8 = 33,
+        D3DFMT_G16R16 = 34,
+        D3DFMT_A2R10G10B10 = 35,
+        D3DFMT_A16B16G16R16 = 36,
+
+        D3DFMT_A8P8 = 40,
+        D3DFMT_P8 = 41,
+
+        D3DFMT_L8 = 50,
+        D3DFMT_A8L8 = 51,
+        D3DFMT_A4L4 = 52,
+
+        D3DFMT_V8U8 = 60,
+        D3DFMT_L6V5U5 = 61,
+        D3DFMT_X8L8V8U8 = 62,
+        D3DFMT_Q8W8V8U8 = 63,
+        D3DFMT_V16U16 = 64,
+        D3DFMT_A2W10V10U10 = 67,
+
+        D3DFMT_UYVY = FileUtils::MakeMagic32('U', 'Y', 'V', 'Y'),
+        D3DFMT_R8G8_B8G8 = FileUtils::MakeMagic32('R', 'G', 'B', 'G'),
+        D3DFMT_YUY2 = FileUtils::MakeMagic32('Y', 'U', 'Y', '2'),
+        D3DFMT_G8R8_G8B8 = FileUtils::MakeMagic32('G', 'R', 'G', 'B'),
+        D3DFMT_DXT1 = FileUtils::MakeMagic32('D', 'X', 'T', '1'),
+        D3DFMT_DXT2 = FileUtils::MakeMagic32('D', 'X', 'T', '2'),
+        D3DFMT_DXT3 = FileUtils::MakeMagic32('D', 'X', 'T', '3'),
+        D3DFMT_DXT4 = FileUtils::MakeMagic32('D', 'X', 'T', '4'),
+        D3DFMT_DXT5 = FileUtils::MakeMagic32('D', 'X', 'T', '5'),
+
+        D3DFMT_D16_LOCKABLE = 70,
+        D3DFMT_D32 = 71,
+        D3DFMT_D15S1 = 73,
+        D3DFMT_D24S8 = 75,
+        D3DFMT_D24X8 = 77,
+        D3DFMT_D24X4S4 = 79,
+        D3DFMT_D16 = 80,
+
+        D3DFMT_D32F_LOCKABLE = 82,
+        D3DFMT_D24FS8 = 83,
+
+        /* D3D9Ex only -- */
+
+        /* Z-Stencil formats valid for CPU access */
+        D3DFMT_D32_LOCKABLE = 84,
+        D3DFMT_S8_LOCKABLE = 85,
+
+        /* -- D3D9Ex only */
+
+        D3DFMT_L16 = 81,
+
+        D3DFMT_VERTEXDATA = 100,
+        D3DFMT_INDEX16 = 101,
+        D3DFMT_INDEX32 = 102,
+
+        D3DFMT_Q16W16V16U16 = 110,
+
+        D3DFMT_MULTI2_ARGB8 = FileUtils::MakeMagic32('M', 'E', 'T', '1'),
+
+        // Floating point surface formats
+
+        // s10e5 formats (16-bits per channel)
+        D3DFMT_R16F = 111,
+        D3DFMT_G16R16F = 112,
+        D3DFMT_A16B16G16R16F = 113,
+
+        // IEEE s23e8 formats (32-bits per channel)
+        D3DFMT_R32F = 114,
+        D3DFMT_G32R32F = 115,
+        D3DFMT_A32B32G32R32F = 116,
+
+        D3DFMT_CxV8U8 = 117,
+
+        /* D3D9Ex only -- */
+
+        // Monochrome 1 bit per pixel format
+        D3DFMT_A1 = 118,
+
+        // 2.8 biased fixed point
+        D3DFMT_A2B10G10R10_XR_BIAS = 119,
+
+        // Binary format indicating that the data has no inherent type
+        D3DFMT_BINARYBUFFER = 199,
+
+        /* -- D3D9Ex only */
+
+        D3DFMT_FORCE_DWORD = 0x7fffffff
+    };
+} // namespace oat
diff --git a/src/Common/Image/DdsTypes.h b/src/Common/Image/DdsTypes.h
@@ -103,7 +103,7 @@ enum DDS_HEADER_DXT10_MISC2
 
 struct DDS_HEADER_DXT10
 {
-    DXGI_FORMAT dxgiFormat;
+    oat::DXGI_FORMAT dxgiFormat;
     D3D10_RESOURCE_DIMENSION resourceDimension;
     uint32_t miscFlag;
     uint32_t arraySize;