Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5bb403ce
Commit
5bb403ce
authored
Jun 08, 2010
by
Matteo Bruni
Committed by
Alexandre Julliard
Jun 10, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Allow sampler declaration without sampler type.
parent
3d5a3a32
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
+20
-0
asmshader.y
dlls/d3dx9_36/asmshader.y
+15
-0
asm.c
dlls/d3dx9_36/tests/asm.c
+5
-0
No files found.
dlls/d3dx9_36/asmshader.y
View file @
5bb403ce
...
...
@@ -618,6 +618,21 @@ instruction: INSTR_ADD omods dreg ',' sregs
}
asm_ctx.funcs->dcl_sampler(&asm_ctx, $2, $3.mod, $4, asm_ctx.line_no);
}
| INSTR_DCL omods REG_SAMPLER
{
TRACE("Sampler declared\n");
if($2.shift != 0) {
asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n",
asm_ctx.line_no);
set_parse_status(&asm_ctx, PARSE_ERR);
}
if(asm_ctx.shader->type != ST_PIXEL) {
asmparser_message(&asm_ctx, "Line %u: Declaration needs a sampler type\n",
asm_ctx.line_no);
set_parse_status(&asm_ctx, PARSE_ERR);
}
asm_ctx.funcs->dcl_sampler(&asm_ctx, BWRITERSTT_UNKNOWN, $2.mod, $3, asm_ctx.line_no);
}
| INSTR_DCL sampdcl omods dcl_inputreg
{
TRACE("Error rule: sampler decl of input reg\n");
...
...
dlls/d3dx9_36/tests/asm.c
View file @
5bb403ce
...
...
@@ -1216,6 +1216,11 @@ static void ps_3_0_test(void) {
"dcl v0
\n
"
,
{
0xffff0300
,
0x0200001f
,
0x80000000
,
0x900f0000
,
0x0000ffff
}
},
{
/* shader 16 */
"ps_3_0
\n
"
"dcl s2
\n
"
,
{
0xffff0300
,
0x0200001f
,
0x80000000
,
0xa00f0802
,
0x0000ffff
}
},
};
exec_tests
(
"ps_3_0"
,
tests
,
sizeof
(
tests
)
/
sizeof
(
tests
[
0
]));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment