=?UTF-8?Q?Rico=20Sch=C3=BCller=20?=: d3dx9/tests: Test all registers set by the constant table.
Alexandre Julliard
julliard at winehq.org
Fri Aug 2 09:53:39 CDT 2013
Module: wine
Branch: master
Commit: b9b6b0585f5cfa72d4ed3974a1f5ab9122339111
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b6b0585f5cfa72d4ed3974a1f5ab9122339111
Author: Rico Schüller <kgbricola at web.de>
Date: Thu Aug 1 22:53:35 2013 +0200
d3dx9/tests: Test all registers set by the constant table.
---
dlls/d3dx9_36/tests/shader.c | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c
index 171d62c..7235fad 100644
--- a/dlls/d3dx9_36/tests/shader.c
+++ b/dlls/d3dx9_36/tests/shader.c
@@ -5912,6 +5912,25 @@ static UINT registerset_compare(IDirect3DDevice9 *device, BOOL is_vs, D3DXREGIST
return err;
}
+static UINT registerset_compare_all(IDirect3DDevice9 *device, BOOL is_vs, D3DXREGISTER_SET regset,
+ UINT start, UINT in_count, const DWORD *expected)
+{
+ D3DXREGISTER_SET regsets[] = {D3DXRS_BOOL, D3DXRS_INT4, D3DXRS_FLOAT4};
+ UINT err = 0, i;
+
+ for (i = 0; i < sizeof(regsets) / sizeof(*regsets); i++)
+ {
+ if (regset == regsets[i])
+ err += registerset_compare(device, is_vs, regset, start, in_count, expected);
+ else
+ err += registerset_compare(device, is_vs, regsets[i], 0, 0, NULL);
+
+ err += registerset_compare(device, !is_vs, regsets[i], 0, 0, NULL);
+ }
+
+ return err;
+}
+
static HRESULT registerset_apply(ID3DXConstantTable *ctable, IDirect3DDevice9 *device, D3DXHANDLE constant,
UINT index, DWORD count, enum Type type)
{
@@ -6095,7 +6114,7 @@ static void test_registerset(void)
ok(hr == D3D_OK, "Set* \"%s\" index %u, count %u failed, got %x, expected %x\n", tablename, i,
test->in_count_min, hr, D3D_OK);
- ret = registerset_compare(device, is_vs, registerset_data[k].regset,
+ ret = registerset_compare_all(device, is_vs, registerset_data[k].regset,
registerset_data[k].start, test->out_count, test->out);
ok(ret == 0, "Get*ShaderConstant \"%s\" index %u, count %u failed\n", tablename, i, test->in_count_min);
@@ -6107,7 +6126,7 @@ static void test_registerset(void)
ok(hr == D3D_OK, "Set* \"%s\" index %u, count %u failed, got %x, expected %x\n", tablename, i,
test->in_count_max, hr, D3D_OK);
- ret = registerset_compare(device, is_vs, registerset_data[k].regset,
+ ret = registerset_compare_all(device, is_vs, registerset_data[k].regset,
registerset_data[k].start, test->out_count, test->out);
ok(ret == 0, "Get*ShaderConstant \"%s\" index %u, count %u failed\n", tablename, i, test->in_count_max);
}
More information about the wine-cvs
mailing list