Module: wine Branch: master Commit: dba338f2e6b8b3417666f140a64e65e2afc894b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dba338f2e6b8b3417666f140...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Sep 27 20:53:01 2006 +0200
d3d9/tests: Don't test texture states beyond the supported maximum.
---
dlls/d3d9/tests/stateblock.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 3eb5d6e..65a11e6 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -23,6 +23,8 @@ #include "wine/test.h"
static HMODULE d3d9_handle = 0;
+static DWORD texture_stages; + static HWND create_window(void) { WNDCLASS wc = {0}; @@ -761,7 +763,7 @@ static void transform_set_handler( hret = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, &tdata->texture0); ok(hret == D3D_OK, "SetTransform returned %#lx.\n", hret);
- hret = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE7, &tdata->texture7); + hret = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0 + texture_stages - 1, &tdata->texture7); ok(hret == D3D_OK, "SetTransform returned %#lx.\n", hret);
hret = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &tdata->world0); @@ -786,7 +788,7 @@ static void transform_get_handler( hret = IDirect3DDevice9_GetTransform(device, D3DTS_TEXTURE0, &tdata->texture0); ok(hret == D3D_OK, "GetTransform returned %#lx.\n", hret);
- hret = IDirect3DDevice9_GetTransform(device, D3DTS_TEXTURE7, &tdata->texture7); + hret = IDirect3DDevice9_GetTransform(device, D3DTS_TEXTURE0 + texture_stages - 1, &tdata->texture7); ok(hret == D3D_OK, "GetTransform returned %#lx.\n", hret);
hret = IDirect3DDevice9_GetTransform(device, D3DTS_WORLD, &tdata->world0); @@ -1317,6 +1319,8 @@ static void test_state_management( ok(hret == D3D_OK, "GetDeviceCaps returned %#lx.\n", hret); if (hret != D3D_OK) return;
+ texture_stages = caps.MaxTextureBlendStages; + if (caps.VertexShaderVersion & 0xffff) { shader_constants_queue_test(device, &tests[tcount], &buffer[bcount], FALSE); bcount += SHADER_CONSTANTS_REQ_BUFFER;