ddraw: Reorder formats in EnumTextureFormats.

Matteo Bruni mbruni at codeweavers.com
Tue Nov 22 18:31:41 CST 2011


Windows drivers seem to agree on the ordering of the first few texture
formats. I don't know yet of any application depending on it, but I
think it won't hurt for us to replicate that.
---
 dlls/ddraw/device.c |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index c33ddbb..e678e90 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -1059,17 +1059,15 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
 
     static const enum wined3d_format_id FormatList[] =
     {
-        /* 32 bit */
-        WINED3DFMT_B8G8R8A8_UNORM,
-        WINED3DFMT_B8G8R8X8_UNORM,
-        /* 24 bit */
-        WINED3DFMT_B8G8R8_UNORM,
-        /* 16 Bit */
+        /* 16 bit */
+        WINED3DFMT_B5G5R5X1_UNORM,
         WINED3DFMT_B5G5R5A1_UNORM,
         WINED3DFMT_B4G4R4A4_UNORM,
         WINED3DFMT_B5G6R5_UNORM,
-        WINED3DFMT_B5G5R5X1_UNORM,
-        /* 8 Bit */
+        /* 32 bit */
+        WINED3DFMT_B8G8R8X8_UNORM,
+        WINED3DFMT_B8G8R8A8_UNORM,
+        /* 8 bit */
         WINED3DFMT_B2G3R3_UNORM,
         WINED3DFMT_P8_UINT,
         /* FOURCC codes */
@@ -1211,17 +1209,15 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface,
 
     static const enum wined3d_format_id FormatList[] =
     {
-        /* 32 bit */
-        WINED3DFMT_B8G8R8A8_UNORM,
-        WINED3DFMT_B8G8R8X8_UNORM,
-        /* 24 bit */
-        WINED3DFMT_B8G8R8_UNORM,
-        /* 16 Bit */
+        /* 16 bit */
+        WINED3DFMT_B5G5R5X1_UNORM,
         WINED3DFMT_B5G5R5A1_UNORM,
         WINED3DFMT_B4G4R4A4_UNORM,
         WINED3DFMT_B5G6R5_UNORM,
-        WINED3DFMT_B5G5R5X1_UNORM,
-        /* 8 Bit */
+        /* 32 bit */
+        WINED3DFMT_B8G8R8X8_UNORM,
+        WINED3DFMT_B8G8R8A8_UNORM,
+        /* 8 bit */
         WINED3DFMT_B2G3R3_UNORM,
         WINED3DFMT_P8_UINT,
         /* FOURCC codes - Not in this version*/
-- 
1.7.3.4




More information about the wine-patches mailing list