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
3225fea3
Commit
3225fea3
authored
Feb 11, 2015
by
Henri Verbeet
Committed by
Alexandre Julliard
Feb 11, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Recognize the SM4 ne opcode.
parent
8506da62
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
0 deletions
+8
-0
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-0
glsl_shader.c
dlls/wined3d/glsl_shader.c
+3
-0
shader.c
dlls/wined3d/shader.c
+1
-0
shader_sm4.c
dlls/wined3d/shader_sm4.c
+2
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-0
No files found.
dlls/wined3d/arb_program_shader.c
View file @
3225fea3
...
...
@@ -5238,6 +5238,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_MOVA */
shader_hw_mov
,
/* WINED3DSIH_MOVC */
NULL
,
/* WINED3DSIH_MUL */
shader_hw_map2gl
,
/* WINED3DSIH_NE */
NULL
,
/* WINED3DSIH_NOP */
shader_hw_nop
,
/* WINED3DSIH_NRM */
shader_hw_nrm
,
/* WINED3DSIH_PHASE */
shader_hw_nop
,
...
...
dlls/wined3d/glsl_shader.c
View file @
3225fea3
...
...
@@ -2357,6 +2357,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins)
case
WINED3DSIH_IGE
:
op
=
"greaterThanEqual"
;
break
;
case
WINED3DSIH_UGE
:
op
=
"greaterThanEqual"
;
break
;
case
WINED3DSIH_LT
:
op
=
"lessThan"
;
break
;
case
WINED3DSIH_NE
:
op
=
"notEqual"
;
break
;
default:
op
=
"<unhandled operator>"
;
ERR
(
"Unhandled opcode %#x.
\n
"
,
ins
->
handler_idx
);
...
...
@@ -2375,6 +2376,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins)
case
WINED3DSIH_IGE
:
op
=
">="
;
break
;
case
WINED3DSIH_UGE
:
op
=
">="
;
break
;
case
WINED3DSIH_LT
:
op
=
"<"
;
break
;
case
WINED3DSIH_NE
:
op
=
"!="
;
break
;
default:
op
=
"<unhandled operator>"
;
ERR
(
"Unhandled opcode %#x.
\n
"
,
ins
->
handler_idx
);
...
...
@@ -6772,6 +6774,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_MOVA */
shader_glsl_mov
,
/* WINED3DSIH_MOVC */
shader_glsl_conditional_move
,
/* WINED3DSIH_MUL */
shader_glsl_binop
,
/* WINED3DSIH_NE */
shader_glsl_relop
,
/* WINED3DSIH_NOP */
shader_glsl_nop
,
/* WINED3DSIH_NRM */
shader_glsl_nrm
,
/* WINED3DSIH_PHASE */
shader_glsl_nop
,
...
...
dlls/wined3d/shader.c
View file @
3225fea3
...
...
@@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_MOVA */
"mova"
,
/* WINED3DSIH_MOVC */
"movc"
,
/* WINED3DSIH_MUL */
"mul"
,
/* WINED3DSIH_NE */
"ne"
,
/* WINED3DSIH_NOP */
"nop"
,
/* WINED3DSIH_NRM */
"nrm"
,
/* WINED3DSIH_PHASE */
"phase"
,
...
...
dlls/wined3d/shader_sm4.c
View file @
3225fea3
...
...
@@ -111,6 +111,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_MOV
=
0x36
,
WINED3D_SM4_OP_MOVC
=
0x37
,
WINED3D_SM4_OP_MUL
=
0x38
,
WINED3D_SM4_OP_NE
=
0x39
,
WINED3D_SM4_OP_RET
=
0x3e
,
WINED3D_SM4_OP_ROUND_NI
=
0x41
,
WINED3D_SM4_OP_RSQ
=
0x44
,
...
...
@@ -278,6 +279,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{
WINED3D_SM4_OP_MOV
,
WINED3DSIH_MOV
,
"F"
,
"F"
},
{
WINED3D_SM4_OP_MOVC
,
WINED3DSIH_MOVC
,
"F"
,
"UFF"
},
{
WINED3D_SM4_OP_MUL
,
WINED3DSIH_MUL
,
"F"
,
"FF"
},
{
WINED3D_SM4_OP_NE
,
WINED3DSIH_NE
,
"U"
,
"FF"
},
{
WINED3D_SM4_OP_RET
,
WINED3DSIH_RET
,
""
,
""
},
{
WINED3D_SM4_OP_ROUND_NI
,
WINED3DSIH_ROUND_NI
,
"F"
,
"F"
},
{
WINED3D_SM4_OP_RSQ
,
WINED3DSIH_RSQ
,
"F"
,
"F"
},
...
...
dlls/wined3d/wined3d_private.h
View file @
3225fea3
...
...
@@ -511,6 +511,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_MOVA
,
WINED3DSIH_MOVC
,
WINED3DSIH_MUL
,
WINED3DSIH_NE
,
WINED3DSIH_NOP
,
WINED3DSIH_NRM
,
WINED3DSIH_PHASE
,
...
...
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