ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Check for oCx register number.

This commit is contained in:
Matteo Bruni 2010-05-21 15:53:44 +02:00 committed by Alexandre Julliard
parent a9118ba171
commit 961db7964d
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3dx9_36/asmparser.c
View File

@ -259,7 +259,7 @@ static const struct allowed_reg_type ps_3_reg_allowed[] = {
{ BWRITERSPR_MISCTYPE, 2 }, /* vPos and vFace */ { BWRITERSPR_MISCTYPE, 2 }, /* vPos and vFace */
{ BWRITERSPR_LOOP, 1 }, { BWRITERSPR_LOOP, 1 },
{ BWRITERSPR_LABEL, 2048 }, { BWRITERSPR_LABEL, 2048 },
{ BWRITERSPR_COLOROUT, ~0U }, { BWRITERSPR_COLOROUT, 4 },
{ BWRITERSPR_DEPTHOUT, 1 }, { BWRITERSPR_DEPTHOUT, 1 },
{ ~0U, 0 } /* End tag */ { ~0U, 0 } /* End tag */
}; };

11
dlls/d3dx9_36/tests/asm.c
View File

@ -1146,6 +1146,11 @@ static void ps_3_0_test(void) {
"texkill v0\n", "texkill v0\n",
{0xffff0300, 0x01000041, 0x900f0000, 0x0000ffff} {0xffff0300, 0x01000041, 0x900f0000, 0x0000ffff}
}, },
{ /* shader 11 */
"ps_3_0\n"
"add oC3, r0, r1\n",
{0xffff0300, 0x03000002, 0x800f0803, 0x80e40000, 0x80e40001, 0x0000ffff}
},
}; };
exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0])); exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0]));
@ -1236,6 +1241,12 @@ static void failure_test(void) {
/* shader 25: _x4 instruction modified not allowed in > ps_1_x */ /* shader 25: _x4 instruction modified not allowed in > ps_1_x */
"ps_3_0\n" "ps_3_0\n"
"add_x4 r0, r0, r1\n", "add_x4 r0, r0, r1\n",
/* shader 26: there aren't oCx registers in ps_1_x */
"ps_1_3\n"
"add oC0, r0, r1\n",
/* shader 27: oC3 is the max in >= ps_2_0 */
"ps_3_0\n"
"add oC4, r0, r1\n",
}; };
HRESULT hr; HRESULT hr;
unsigned int i; unsigned int i;