26 Feb
2020
26 Feb
'20
5:20 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff68d200dafa07c6c0098…
commit ff68d200dafa07c6c009887f9b77f7c11563f27c
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Sat Feb 1 18:02:27 2020 +0100
Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Wed Feb 26 18:19:18 2020 +0100
[WINESYNC] d3dx9_36/tests: Add additional tests for special cases.
wine-staging patch by Christian Costa <titan.costa(a)gmail.com>
---
modules/rostests/winetests/d3dx9_36/shader.c | 163 ++++++++++++++++++
...ts__Add_additional_tests_for_special_cases.diff | 188 +++++++++++++++++++++
2 files changed, 351 insertions(+)
diff --git a/modules/rostests/winetests/d3dx9_36/shader.c
b/modules/rostests/winetests/d3dx9_36/shader.c
index 02675c65b53..0d7dcc34883 100644
--- a/modules/rostests/winetests/d3dx9_36/shader.c
+++ b/modules/rostests/winetests/d3dx9_36/shader.c
@@ -6575,6 +6575,60 @@ static void test_shader_semantics(void)
}
}
+static const DWORD ps_tex[] = {
+ 0xffff0103, /* ps_1_3
*/
+ 0x00000042, 0xb00f0000, /* tex t0
*/
+ 0x00000000, /* nop
*/
+ 0x0000ffff};
+
+static const DWORD ps_texld_1_4[] = {
+ 0xffff0104, /* ps_1_4
*/
+ 0x00000042, 0xb00f0000, 0xa0e40000, /* texld t0,
c0 */
+ 0x00000000, /* nop
*/
+ 0x0000ffff};
+
+static const DWORD ps_texld_2_0[] = {
+ 0xffff0200, /* ps_2_0
*/
+ 0x00000042, 0xb00f0000, 0xa0e40000, 0xa0e40001, /* texld t0,
c0, c1 */
+ 0x00000000, /* nop
*/
+ 0x0000ffff};
+
+static const DWORD ps_texcoord[] = {
+ 0xffff0103, /* ps_1_4
*/
+ 0x00000040, 0xb00f0000, /* texcoord
t0 */
+ 0x00000000, /* nop
*/
+ 0x0000ffff};
+
+static const DWORD ps_texcrd[] = {
+ 0xffff0104, /* ps_2_0
*/
+ 0x00000040, 0xb00f0000, 0xa0e40000, /* texcrd t0,
c0 */
+ 0x00000000, /* nop
*/
+ 0x0000ffff};
+
+static const DWORD ps_sincos_2_0[] = {
+ 0xffff0200, /* ps_2_0
*/
+ 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos t0,
c0, c1, c2 */
+ 0x00000000, /* nop
*/
+ 0x0000ffff};
+
+static const DWORD ps_sincos_3_0[] = {
+ 0xffff0300, /* ps_3_0
*/
+ 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos t0,
c0 */
+ 0x00000000, /* nop
*/
+ 0x0000ffff};
+
+static const DWORD vs_sincos_2_0[] = {
+ 0xfffe0200, /* vs_2_0
*/
+ 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos a0,
c0, c1, c2 */
+ 0x00000000, /* nop
*/
+ 0x0000ffff};
+
+static const DWORD vs_sincos_3_0[] = {
+ 0xfffe0300, /* vs_3_0
*/
+ 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos a0,
c0 */
+ 0x00000000, /* nop
*/
+ 0x0000ffff};
+
static void test_disassemble_shader(void)
{
static const char disasm_vs[] = " vs_1_1\n"
@@ -6589,6 +6643,33 @@ static void test_disassemble_shader(void)
" dp3 r0, c1, c0\n"
" mul r0, v0, r0\n"
" mul r0, t0, r0\n";
+ static const char disasm_ps_tex[] = " ps_1_3\n"
+ " tex t0\n"
+ " nop\n";
+ static const char disasm_ps_texld_1_4[] = " ps_1_4\n"
+ " texld t0, c0\n"
+ " nop\n";
+ static const char disasm_ps_texld_2_0[] = " ps_2_0\n"
+ " texld t0, c0, c1\n"
+ " nop\n";
+ static const char disasm_ps_texcoord[] = " ps_1_3\n"
+ " texcoord t0\n"
+ " nop\n";
+ static const char disasm_ps_texcrd[] = " ps_1_4\n"
+ " texcrd t0, c0\n"
+ " nop\n";
+ static const char disasm_ps_sincos_2_0[] = " ps_2_0\n"
+ " sincos t0, c0, c1, c2\n"
+ " nop\n";
+ static const char disasm_ps_sincos_3_0[] = " ps_3_0\n"
+ " sincos t0, c0\n"
+ " nop\n";
+ static const char disasm_vs_sincos_2_0[] = " vs_2_0\n"
+ " sincos a0, c0, c1, c2\n"
+ " nop\n";
+ static const char disasm_vs_sincos_3_0[] = " vs_3_0\n"
+ " sincos a0, c0\n"
+ " nop\n";
ID3DXBuffer *disassembly;
HRESULT ret;
char *ptr;
@@ -6618,6 +6699,88 @@ static void test_disassemble_shader(void)
ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */
"Returned '%s', expected '%s'\n", ptr, disasm_ps);
ID3DXBuffer_Release(disassembly);
+
+ /* Test tex instruction with pixel shader 1.3 */
+ disassembly = (void *)0xdeadbeef;
+ ret = D3DXDisassembleShader(ps_tex, FALSE, NULL, &disassembly);
+ ok(ret == D3D_OK, "Failed with %#x\n", ret);
+ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
+ ok(!memcmp(ptr, disasm_ps_tex, sizeof(disasm_ps_tex) - 1), /* compare beginning */
+ "Returned '%s', expected '%s'\n", ptr, disasm_ps_tex);
+ ID3DXBuffer_Release(disassembly);
+
+ /* Test texld instruction with pixel shader 1.4 */
+ disassembly = (void *)0xdeadbeef;
+ ret = D3DXDisassembleShader(ps_texld_1_4, FALSE, NULL, &disassembly);
+ ok(ret == D3D_OK, "Failed with %#x\n", ret);
+ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
+ ok(!memcmp(ptr, disasm_ps_texld_1_4, sizeof(disasm_ps_texld_1_4) - 1), /* compare
beginning */
+ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_texld_1_4);
+ ID3DXBuffer_Release(disassembly);
+
+ /* Test texld instruction with pixel shader 2.0 */
+ disassembly = (void *)0xdeadbeef;
+ ret = D3DXDisassembleShader(ps_texld_2_0, FALSE, NULL, &disassembly);
+ ok(ret == D3D_OK, "Failed with %#x\n", ret);
+ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
+ ok(!memcmp(ptr, disasm_ps_texld_2_0, sizeof(disasm_ps_texld_2_0) - 1), /* compare
beginning */
+ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_texld_2_0);
+ ID3DXBuffer_Release(disassembly);
+
+ /* Test texcoord instruction with pixel shader 1.3 */
+ disassembly = (void *)0xdeadbeef;
+ ret = D3DXDisassembleShader(ps_texcoord, FALSE, NULL, &disassembly);
+ ok(ret == D3D_OK, "Failed with %#x\n", ret);
+ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
+ ok(!memcmp(ptr, disasm_ps_texcoord, sizeof(disasm_ps_texcoord) - 1), /* compare
beginning */
+ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_texcoord);
+ ID3DXBuffer_Release(disassembly);
+
+ /* Test texcrd instruction with pixel shader 1.4 */
+ disassembly = (void *)0xdeadbeef;
+ ret = D3DXDisassembleShader(ps_texcrd, FALSE, NULL, &disassembly);
+ ok(ret == D3D_OK, "Failed with %#x\n", ret);
+ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
+ ok(!memcmp(ptr, disasm_ps_texcrd, sizeof(disasm_ps_texcrd) - 1), /* compare beginning
*/
+ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_texcrd);
+ ID3DXBuffer_Release(disassembly);
+
+ /* Test sincos instruction pixel shader 2.0 */
+ disassembly = (void *)0xdeadbeef;
+ ret = D3DXDisassembleShader(ps_sincos_2_0, FALSE, NULL, &disassembly);
+ ok(ret == D3D_OK, "Failed with %#x\n", ret);
+ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
+ ok(!memcmp(ptr, disasm_ps_sincos_2_0, sizeof(disasm_ps_sincos_2_0) - 1), /* compare
beginning */
+ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_sincos_2_0);
+ ID3DXBuffer_Release(disassembly);
+
+ /* Test sincos instruction with pixel shader 3.0 */
+ disassembly = (void *)0xdeadbeef;
+ ret = D3DXDisassembleShader(ps_sincos_3_0, FALSE, NULL, &disassembly);
+ ok(ret == D3D_OK, "Failed with %#x\n", ret);
+ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
+ ok(!memcmp(ptr, disasm_ps_sincos_3_0, sizeof(disasm_ps_sincos_3_0) - 1), /* compare
beginning */
+ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_sincos_3_0);
+ ID3DXBuffer_Release(disassembly);
+
+ /* Test sincos instruction with pixel shader 2.0 */
+ disassembly = (void *)0xdeadbeef;
+ ret = D3DXDisassembleShader(vs_sincos_2_0, FALSE, NULL, &disassembly);
+ ok(ret == D3D_OK, "Failed with %#x\n", ret);
+ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
+ ok(!memcmp(ptr, disasm_vs_sincos_2_0, sizeof(disasm_vs_sincos_2_0) - 1), /* compare
beginning */
+ "Returned '%s', expected '%s'\n", ptr,
disasm_vs_sincos_2_0);
+ ID3DXBuffer_Release(disassembly);
+
+ /* Test sincos instruction with pixel shader 3.0 */
+ disassembly = (void *)0xdeadbeef;
+ ret = D3DXDisassembleShader(vs_sincos_3_0, FALSE, NULL, &disassembly);
+ ok(ret == D3D_OK, "Failed with %#x\n", ret);
+ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
+ ok(!memcmp(ptr, disasm_vs_sincos_3_0, sizeof(disasm_vs_sincos_3_0) - 1), /* compare
beginning */
+ "Returned '%s', expected '%s'\n", ptr,
disasm_vs_sincos_3_0);
+ ID3DXBuffer_Release(disassembly);
+
}
START_TEST(shader)
diff --git
a/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36_tests__Add_additional_tests_for_special_cases.diff
b/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36_tests__Add_additional_tests_for_special_cases.diff
new file mode 100644
index 00000000000..fb56871fa5e
--- /dev/null
+++
b/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36_tests__Add_additional_tests_for_special_cases.diff
@@ -0,0 +1,188 @@
+diff --git a/modules/rostests/winetests/d3dx9_36/shader.c
b/modules/rostests/winetests/d3dx9_36/shader.c
+index 02675c6..0d7dcc3 100644
+--- a/modules/rostests/winetests/d3dx9_36/shader.c
++++ b/modules/rostests/winetests/d3dx9_36/shader.c
+@@ -6575,6 +6575,60 @@ static void test_shader_semantics(void)
+ }
+ }
+
++static const DWORD ps_tex[] = {
++ 0xffff0103, /* ps_1_3
*/
++ 0x00000042, 0xb00f0000, /* tex t0
*/
++ 0x00000000, /* nop
*/
++ 0x0000ffff};
++
++static const DWORD ps_texld_1_4[] = {
++ 0xffff0104, /* ps_1_4
*/
++ 0x00000042, 0xb00f0000, 0xa0e40000, /* texld t0,
c0 */
++ 0x00000000, /* nop
*/
++ 0x0000ffff};
++
++static const DWORD ps_texld_2_0[] = {
++ 0xffff0200, /* ps_2_0
*/
++ 0x00000042, 0xb00f0000, 0xa0e40000, 0xa0e40001, /* texld t0,
c0, c1 */
++ 0x00000000, /* nop
*/
++ 0x0000ffff};
++
++static const DWORD ps_texcoord[] = {
++ 0xffff0103, /* ps_1_4
*/
++ 0x00000040, 0xb00f0000, /* texcoord
t0 */
++ 0x00000000, /* nop
*/
++ 0x0000ffff};
++
++static const DWORD ps_texcrd[] = {
++ 0xffff0104, /* ps_2_0
*/
++ 0x00000040, 0xb00f0000, 0xa0e40000, /* texcrd
t0, c0 */
++ 0x00000000, /* nop
*/
++ 0x0000ffff};
++
++static const DWORD ps_sincos_2_0[] = {
++ 0xffff0200, /* ps_2_0
*/
++ 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos
t0, c0, c1, c2 */
++ 0x00000000, /* nop
*/
++ 0x0000ffff};
++
++static const DWORD ps_sincos_3_0[] = {
++ 0xffff0300, /* ps_3_0
*/
++ 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos
t0, c0 */
++ 0x00000000, /* nop
*/
++ 0x0000ffff};
++
++static const DWORD vs_sincos_2_0[] = {
++ 0xfffe0200, /* vs_2_0
*/
++ 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos
a0, c0, c1, c2 */
++ 0x00000000, /* nop
*/
++ 0x0000ffff};
++
++static const DWORD vs_sincos_3_0[] = {
++ 0xfffe0300, /* vs_3_0
*/
++ 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos
a0, c0 */
++ 0x00000000, /* nop
*/
++ 0x0000ffff};
++
+ static void test_disassemble_shader(void)
+ {
+ static const char disasm_vs[] = " vs_1_1\n"
+@@ -6589,6 +6643,33 @@ static void test_disassemble_shader(void)
+ " dp3 r0, c1, c0\n"
+ " mul r0, v0, r0\n"
+ " mul r0, t0, r0\n";
++ static const char disasm_ps_tex[] = " ps_1_3\n"
++ " tex t0\n"
++ " nop\n";
++ static const char disasm_ps_texld_1_4[] = " ps_1_4\n"
++ " texld t0, c0\n"
++ " nop\n";
++ static const char disasm_ps_texld_2_0[] = " ps_2_0\n"
++ " texld t0, c0, c1\n"
++ " nop\n";
++ static const char disasm_ps_texcoord[] = " ps_1_3\n"
++ " texcoord t0\n"
++ " nop\n";
++ static const char disasm_ps_texcrd[] = " ps_1_4\n"
++ " texcrd t0, c0\n"
++ " nop\n";
++ static const char disasm_ps_sincos_2_0[] = " ps_2_0\n"
++ " sincos t0, c0, c1, c2\n"
++ " nop\n";
++ static const char disasm_ps_sincos_3_0[] = " ps_3_0\n"
++ " sincos t0, c0\n"
++ " nop\n";
++ static const char disasm_vs_sincos_2_0[] = " vs_2_0\n"
++ " sincos a0, c0, c1, c2\n"
++ " nop\n";
++ static const char disasm_vs_sincos_3_0[] = " vs_3_0\n"
++ " sincos a0, c0\n"
++ " nop\n";
+ ID3DXBuffer *disassembly;
+ HRESULT ret;
+ char *ptr;
+@@ -6618,6 +6699,88 @@ static void test_disassemble_shader(void)
+ ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */
+ "Returned '%s', expected '%s'\n", ptr, disasm_ps);
+ ID3DXBuffer_Release(disassembly);
++
++ /* Test tex instruction with pixel shader 1.3 */
++ disassembly = (void *)0xdeadbeef;
++ ret = D3DXDisassembleShader(ps_tex, FALSE, NULL, &disassembly);
++ ok(ret == D3D_OK, "Failed with %#x\n", ret);
++ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
++ ok(!memcmp(ptr, disasm_ps_tex, sizeof(disasm_ps_tex) - 1), /* compare beginning */
++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_tex);
++ ID3DXBuffer_Release(disassembly);
++
++ /* Test texld instruction with pixel shader 1.4 */
++ disassembly = (void *)0xdeadbeef;
++ ret = D3DXDisassembleShader(ps_texld_1_4, FALSE, NULL, &disassembly);
++ ok(ret == D3D_OK, "Failed with %#x\n", ret);
++ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
++ ok(!memcmp(ptr, disasm_ps_texld_1_4, sizeof(disasm_ps_texld_1_4) - 1), /* compare
beginning */
++ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_texld_1_4);
++ ID3DXBuffer_Release(disassembly);
++
++ /* Test texld instruction with pixel shader 2.0 */
++ disassembly = (void *)0xdeadbeef;
++ ret = D3DXDisassembleShader(ps_texld_2_0, FALSE, NULL, &disassembly);
++ ok(ret == D3D_OK, "Failed with %#x\n", ret);
++ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
++ ok(!memcmp(ptr, disasm_ps_texld_2_0, sizeof(disasm_ps_texld_2_0) - 1), /* compare
beginning */
++ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_texld_2_0);
++ ID3DXBuffer_Release(disassembly);
++
++ /* Test texcoord instruction with pixel shader 1.3 */
++ disassembly = (void *)0xdeadbeef;
++ ret = D3DXDisassembleShader(ps_texcoord, FALSE, NULL, &disassembly);
++ ok(ret == D3D_OK, "Failed with %#x\n", ret);
++ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
++ ok(!memcmp(ptr, disasm_ps_texcoord, sizeof(disasm_ps_texcoord) - 1), /* compare
beginning */
++ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_texcoord);
++ ID3DXBuffer_Release(disassembly);
++
++ /* Test texcrd instruction with pixel shader 1.4 */
++ disassembly = (void *)0xdeadbeef;
++ ret = D3DXDisassembleShader(ps_texcrd, FALSE, NULL, &disassembly);
++ ok(ret == D3D_OK, "Failed with %#x\n", ret);
++ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
++ ok(!memcmp(ptr, disasm_ps_texcrd, sizeof(disasm_ps_texcrd) - 1), /* compare
beginning */
++ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_texcrd);
++ ID3DXBuffer_Release(disassembly);
++
++ /* Test sincos instruction pixel shader 2.0 */
++ disassembly = (void *)0xdeadbeef;
++ ret = D3DXDisassembleShader(ps_sincos_2_0, FALSE, NULL, &disassembly);
++ ok(ret == D3D_OK, "Failed with %#x\n", ret);
++ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
++ ok(!memcmp(ptr, disasm_ps_sincos_2_0, sizeof(disasm_ps_sincos_2_0) - 1), /* compare
beginning */
++ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_sincos_2_0);
++ ID3DXBuffer_Release(disassembly);
++
++ /* Test sincos instruction with pixel shader 3.0 */
++ disassembly = (void *)0xdeadbeef;
++ ret = D3DXDisassembleShader(ps_sincos_3_0, FALSE, NULL, &disassembly);
++ ok(ret == D3D_OK, "Failed with %#x\n", ret);
++ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
++ ok(!memcmp(ptr, disasm_ps_sincos_3_0, sizeof(disasm_ps_sincos_3_0) - 1), /* compare
beginning */
++ "Returned '%s', expected '%s'\n", ptr,
disasm_ps_sincos_3_0);
++ ID3DXBuffer_Release(disassembly);
++
++ /* Test sincos instruction with pixel shader 2.0 */
++ disassembly = (void *)0xdeadbeef;
++ ret = D3DXDisassembleShader(vs_sincos_2_0, FALSE, NULL, &disassembly);
++ ok(ret == D3D_OK, "Failed with %#x\n", ret);
++ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
++ ok(!memcmp(ptr, disasm_vs_sincos_2_0, sizeof(disasm_vs_sincos_2_0) - 1), /* compare
beginning */
++ "Returned '%s', expected '%s'\n", ptr,
disasm_vs_sincos_2_0);
++ ID3DXBuffer_Release(disassembly);
++
++ /* Test sincos instruction with pixel shader 3.0 */
++ disassembly = (void *)0xdeadbeef;
++ ret = D3DXDisassembleShader(vs_sincos_3_0, FALSE, NULL, &disassembly);
++ ok(ret == D3D_OK, "Failed with %#x\n", ret);
++ ptr = ID3DXBuffer_GetBufferPointer(disassembly);
++ ok(!memcmp(ptr, disasm_vs_sincos_3_0, sizeof(disasm_vs_sincos_3_0) - 1), /* compare
beginning */
++ "Returned '%s', expected '%s'\n", ptr,
disasm_vs_sincos_3_0);
++ ID3DXBuffer_Release(disassembly);
++
+ }
+
+ START_TEST(shader)