=?UTF-8?Q?Rico=20Sch=C3=BCller=20?=: d3dx9/tests: Check if D3DFMT_X1R5G5B5 is supported.
Alexandre Julliard
julliard at winehq.org
Tue Mar 11 14:45:40 CDT 2014
Module: wine
Branch: master
Commit: 9809a3670c50723e9b5a63fbd05b1cf06408eb4c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9809a3670c50723e9b5a63fbd05b1cf06408eb4c
Author: Rico Schüller <kgbricola at web.de>
Date: Mon Mar 10 19:47:36 2014 +0100
d3dx9/tests: Check if D3DFMT_X1R5G5B5 is supported.
---
dlls/d3dx9_36/tests/texture.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c
index 631a658..aea09d5 100644
--- 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);
More information about the wine-cvs
mailing list