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
e4cb3b50
Commit
e4cb3b50
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 or opcode.
parent
3225fea3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
0 deletions
+7
-0
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-0
glsl_shader.c
dlls/wined3d/glsl_shader.c
+2
-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 @
e4cb3b50
...
@@ -5241,6 +5241,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
...
@@ -5241,6 +5241,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_NE */
NULL
,
/* WINED3DSIH_NE */
NULL
,
/* WINED3DSIH_NOP */
shader_hw_nop
,
/* WINED3DSIH_NOP */
shader_hw_nop
,
/* WINED3DSIH_NRM */
shader_hw_nrm
,
/* WINED3DSIH_NRM */
shader_hw_nrm
,
/* WINED3DSIH_OR */
NULL
,
/* WINED3DSIH_PHASE */
shader_hw_nop
,
/* WINED3DSIH_PHASE */
shader_hw_nop
,
/* WINED3DSIH_POW */
shader_hw_pow
,
/* WINED3DSIH_POW */
shader_hw_pow
,
/* WINED3DSIH_RCP */
shader_hw_scalar_op
,
/* WINED3DSIH_RCP */
shader_hw_scalar_op
,
...
...
dlls/wined3d/glsl_shader.c
View file @
e4cb3b50
...
@@ -2319,6 +2319,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins)
...
@@ -2319,6 +2319,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins)
case
WINED3DSIH_IADD
:
op
=
"+"
;
break
;
case
WINED3DSIH_IADD
:
op
=
"+"
;
break
;
case
WINED3DSIH_ISHL
:
op
=
"<<"
;
break
;
case
WINED3DSIH_ISHL
:
op
=
"<<"
;
break
;
case
WINED3DSIH_MUL
:
op
=
"*"
;
break
;
case
WINED3DSIH_MUL
:
op
=
"*"
;
break
;
case
WINED3DSIH_OR
:
op
=
"|"
;
break
;
case
WINED3DSIH_SUB
:
op
=
"-"
;
break
;
case
WINED3DSIH_SUB
:
op
=
"-"
;
break
;
case
WINED3DSIH_USHR
:
op
=
">>"
;
break
;
case
WINED3DSIH_USHR
:
op
=
">>"
;
break
;
case
WINED3DSIH_XOR
:
op
=
"^"
;
break
;
case
WINED3DSIH_XOR
:
op
=
"^"
;
break
;
...
@@ -6777,6 +6778,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
...
@@ -6777,6 +6778,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_NE */
shader_glsl_relop
,
/* WINED3DSIH_NE */
shader_glsl_relop
,
/* WINED3DSIH_NOP */
shader_glsl_nop
,
/* WINED3DSIH_NOP */
shader_glsl_nop
,
/* WINED3DSIH_NRM */
shader_glsl_nrm
,
/* WINED3DSIH_NRM */
shader_glsl_nrm
,
/* WINED3DSIH_OR */
shader_glsl_binop
,
/* WINED3DSIH_PHASE */
shader_glsl_nop
,
/* WINED3DSIH_PHASE */
shader_glsl_nop
,
/* WINED3DSIH_POW */
shader_glsl_pow
,
/* WINED3DSIH_POW */
shader_glsl_pow
,
/* WINED3DSIH_RCP */
shader_glsl_scalar_op
,
/* WINED3DSIH_RCP */
shader_glsl_scalar_op
,
...
...
dlls/wined3d/shader.c
View file @
e4cb3b50
...
@@ -111,6 +111,7 @@ static const char * const shader_opcode_names[] =
...
@@ -111,6 +111,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_NE */
"ne"
,
/* WINED3DSIH_NE */
"ne"
,
/* WINED3DSIH_NOP */
"nop"
,
/* WINED3DSIH_NOP */
"nop"
,
/* WINED3DSIH_NRM */
"nrm"
,
/* WINED3DSIH_NRM */
"nrm"
,
/* WINED3DSIH_OR */
"or"
,
/* WINED3DSIH_PHASE */
"phase"
,
/* WINED3DSIH_PHASE */
"phase"
,
/* WINED3DSIH_POW */
"pow"
,
/* WINED3DSIH_POW */
"pow"
,
/* WINED3DSIH_RCP */
"rcp"
,
/* WINED3DSIH_RCP */
"rcp"
,
...
...
dlls/wined3d/shader_sm4.c
View file @
e4cb3b50
...
@@ -112,6 +112,7 @@ enum wined3d_sm4_opcode
...
@@ -112,6 +112,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_MOVC
=
0x37
,
WINED3D_SM4_OP_MOVC
=
0x37
,
WINED3D_SM4_OP_MUL
=
0x38
,
WINED3D_SM4_OP_MUL
=
0x38
,
WINED3D_SM4_OP_NE
=
0x39
,
WINED3D_SM4_OP_NE
=
0x39
,
WINED3D_SM4_OP_OR
=
0x3c
,
WINED3D_SM4_OP_RET
=
0x3e
,
WINED3D_SM4_OP_RET
=
0x3e
,
WINED3D_SM4_OP_ROUND_NI
=
0x41
,
WINED3D_SM4_OP_ROUND_NI
=
0x41
,
WINED3D_SM4_OP_RSQ
=
0x44
,
WINED3D_SM4_OP_RSQ
=
0x44
,
...
@@ -280,6 +281,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
...
@@ -280,6 +281,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{
WINED3D_SM4_OP_MOVC
,
WINED3DSIH_MOVC
,
"F"
,
"UFF"
},
{
WINED3D_SM4_OP_MOVC
,
WINED3DSIH_MOVC
,
"F"
,
"UFF"
},
{
WINED3D_SM4_OP_MUL
,
WINED3DSIH_MUL
,
"F"
,
"FF"
},
{
WINED3D_SM4_OP_MUL
,
WINED3DSIH_MUL
,
"F"
,
"FF"
},
{
WINED3D_SM4_OP_NE
,
WINED3DSIH_NE
,
"U"
,
"FF"
},
{
WINED3D_SM4_OP_NE
,
WINED3DSIH_NE
,
"U"
,
"FF"
},
{
WINED3D_SM4_OP_OR
,
WINED3DSIH_OR
,
"U"
,
"UU"
},
{
WINED3D_SM4_OP_RET
,
WINED3DSIH_RET
,
""
,
""
},
{
WINED3D_SM4_OP_RET
,
WINED3DSIH_RET
,
""
,
""
},
{
WINED3D_SM4_OP_ROUND_NI
,
WINED3DSIH_ROUND_NI
,
"F"
,
"F"
},
{
WINED3D_SM4_OP_ROUND_NI
,
WINED3DSIH_ROUND_NI
,
"F"
,
"F"
},
{
WINED3D_SM4_OP_RSQ
,
WINED3DSIH_RSQ
,
"F"
,
"F"
},
{
WINED3D_SM4_OP_RSQ
,
WINED3DSIH_RSQ
,
"F"
,
"F"
},
...
...
dlls/wined3d/wined3d_private.h
View file @
e4cb3b50
...
@@ -514,6 +514,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
...
@@ -514,6 +514,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_NE
,
WINED3DSIH_NE
,
WINED3DSIH_NOP
,
WINED3DSIH_NOP
,
WINED3DSIH_NRM
,
WINED3DSIH_NRM
,
WINED3DSIH_OR
,
WINED3DSIH_PHASE
,
WINED3DSIH_PHASE
,
WINED3DSIH_POW
,
WINED3DSIH_POW
,
WINED3DSIH_RCP
,
WINED3DSIH_RCP
,
...
...
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