d3dx9/tests: Check if D3DFMT_X1R5G5B5 is supported.

9809a367 · Rico Schüller · Alexandre Julliard · 25084233 · 9809a367
Commit 9809a367 authored Mar 10, 2014 by Rico Schüller Committed by Alexandre Julliard Mar 11, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

texture.c dlls/d3dx9_36/tests/texture.c +7 -7

No files found.
--- a/dlls/d3dx9_36/tests/texture.c
+++ b/dlls/d3dx9_36/tests/texture.c
@@ -304,14 +304,14 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device)
    if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType,
                                               mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_R3G3B2)))
        expected = D3DFMT_R3G3B2;
+    else if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType,
+                                                    mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X4R4G4B4)))
+        expected = D3DFMT_X4R4G4B4;
+    else if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType,
+                                                    mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X1R5G5B5)))
+        expected = D3DFMT_X1R5G5B5;
    else
-    {
-        if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType,
-                                                   mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X4R4G4B4)))
-            expected = D3DFMT_X4R4G4B4;
-        else
-            expected = D3DFMT_X1R5G5B5;
-    }
+        expected = D3DFMT_R5G6B5;

    format = D3DFMT_R3G3B2;
    hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT);