Module: wine Branch: master Commit: b4736bd7673496cd44244ff06a19b752ae23b818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4736bd7673496cd44244ff06a...
Author: Matteo Bruni mbruni@codeweavers.com Date: Fri Oct 1 23:50:55 2010 +0200
d3dx9/tests: Fix a shader test failure.
---
dlls/d3dx9_36/tests/shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 6bf0de3..3615279 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -131,7 +131,8 @@ static void test_get_shader_constant_table_ex(void)
/* With invalid CTAB data */ hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table); - ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); + ok(hr == D3DXERR_INVALIDDATA || broken(hr == D3D_OK), /* winxp 64-bit, w2k3 64-bit */ + "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); if (constant_table) ID3DXConstantTable_Release(constant_table);
hr = D3DXGetShaderConstantTableEx(shader_with_ctab, 0, &constant_table);