Module: wine Branch: master Commit: 708e217506b82f7d159aaa929315956a6f8dd9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=708e217506b82f7d159aaa9293...
Author: Stefan Dösinger stefan@codeweavers.com Date: Tue Feb 12 18:27:56 2008 +0100
d3d9: ATI drivers do not handle D3DUSAGE_QUERY_LEGACYBUMPMAP properly.
---
dlls/d3d9/tests/visual.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f799af8..be45ac6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6468,10 +6468,14 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) skip("D3DTEXOPCAPS_BUMPENVMAP not set, skipping bumpmap tests\n"); return; } else { + /* This check is disabled, some Windows drivers do not handle D3DUSAGE_QUERY_LEGACYBUMPMAP properly. + * They report that it is not supported, but after that bump mapping works properly. So just test + * if the format is generally supported, and check the BUMPENVMAP flag + */ IDirect3D9 *d3d9;
IDirect3DDevice9_GetDirect3D(device, &d3d9); - hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_LEGACYBUMPMAP, + hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_V8U8); IDirect3D9_Release(d3d9); if(FAILED(hr)) {