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
8c18ebf6
Commit
8c18ebf6
authored
Nov 17, 2014
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 17, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Recognize the SM4 uge opcode.
parent
8681999e
Show 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 @
8c18ebf6
...
@@ -5279,6 +5279,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
...
@@ -5279,6 +5279,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_TEXREG2GB */
pshader_hw_texreg2gb
,
/* WINED3DSIH_TEXREG2GB */
pshader_hw_texreg2gb
,
/* WINED3DSIH_TEXREG2RGB */
pshader_hw_texreg2rgb
,
/* WINED3DSIH_TEXREG2RGB */
pshader_hw_texreg2rgb
,
/* WINED3DSIH_UDIV */
NULL
,
/* WINED3DSIH_UDIV */
NULL
,
/* WINED3DSIH_UGE */
NULL
,
/* WINED3DSIH_USHR */
NULL
,
/* WINED3DSIH_USHR */
NULL
,
/* WINED3DSIH_UTOF */
NULL
,
/* WINED3DSIH_UTOF */
NULL
,
/* WINED3DSIH_XOR */
NULL
,
/* WINED3DSIH_XOR */
NULL
,
...
...
dlls/wined3d/glsl_shader.c
View file @
8c18ebf6
...
@@ -2348,6 +2348,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins)
...
@@ -2348,6 +2348,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins)
case
WINED3DSIH_EQ
:
op
=
"equal"
;
break
;
case
WINED3DSIH_EQ
:
op
=
"equal"
;
break
;
case
WINED3DSIH_GE
:
op
=
"greaterThanEqual"
;
break
;
case
WINED3DSIH_GE
:
op
=
"greaterThanEqual"
;
break
;
case
WINED3DSIH_IGE
:
op
=
"greaterThanEqual"
;
break
;
case
WINED3DSIH_IGE
:
op
=
"greaterThanEqual"
;
break
;
case
WINED3DSIH_UGE
:
op
=
"greaterThanEqual"
;
break
;
case
WINED3DSIH_LT
:
op
=
"lessThan"
;
break
;
case
WINED3DSIH_LT
:
op
=
"lessThan"
;
break
;
default:
default:
op
=
"<unhandled operator>"
;
op
=
"<unhandled operator>"
;
...
@@ -2365,6 +2366,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins)
...
@@ -2365,6 +2366,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins)
case
WINED3DSIH_EQ
:
op
=
"=="
;
break
;
case
WINED3DSIH_EQ
:
op
=
"=="
;
break
;
case
WINED3DSIH_GE
:
op
=
">="
;
break
;
case
WINED3DSIH_GE
:
op
=
">="
;
break
;
case
WINED3DSIH_IGE
:
op
=
">="
;
break
;
case
WINED3DSIH_IGE
:
op
=
">="
;
break
;
case
WINED3DSIH_UGE
:
op
=
">="
;
break
;
case
WINED3DSIH_LT
:
op
=
"<"
;
break
;
case
WINED3DSIH_LT
:
op
=
"<"
;
break
;
default:
default:
op
=
"<unhandled operator>"
;
op
=
"<unhandled operator>"
;
...
@@ -6764,6 +6766,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
...
@@ -6764,6 +6766,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_TEXREG2GB */
shader_glsl_texreg2gb
,
/* WINED3DSIH_TEXREG2GB */
shader_glsl_texreg2gb
,
/* WINED3DSIH_TEXREG2RGB */
shader_glsl_texreg2rgb
,
/* WINED3DSIH_TEXREG2RGB */
shader_glsl_texreg2rgb
,
/* WINED3DSIH_UDIV */
shader_glsl_udiv
,
/* WINED3DSIH_UDIV */
shader_glsl_udiv
,
/* WINED3DSIH_UGE */
shader_glsl_relop
,
/* WINED3DSIH_USHR */
shader_glsl_binop
,
/* WINED3DSIH_USHR */
shader_glsl_binop
,
/* WINED3DSIH_UTOF */
shader_glsl_to_float
,
/* WINED3DSIH_UTOF */
shader_glsl_to_float
,
/* WINED3DSIH_XOR */
shader_glsl_binop
,
/* WINED3DSIH_XOR */
shader_glsl_binop
,
...
...
dlls/wined3d/shader.c
View file @
8c18ebf6
...
@@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] =
...
@@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_TEXREG2GB */
"texreg2gb"
,
/* WINED3DSIH_TEXREG2GB */
"texreg2gb"
,
/* WINED3DSIH_TEXREG2RGB */
"texreg2rgb"
,
/* WINED3DSIH_TEXREG2RGB */
"texreg2rgb"
,
/* WINED3DSIH_UDIV */
"udiv"
,
/* WINED3DSIH_UDIV */
"udiv"
,
/* WINED3DSIH_UGE */
"uge"
,
/* WINED3DSIH_USHR */
"ushr"
,
/* WINED3DSIH_USHR */
"ushr"
,
/* WINED3DSIH_UTOF */
"utof"
,
/* WINED3DSIH_UTOF */
"utof"
,
/* WINED3DSIH_XOR */
"xor"
,
/* WINED3DSIH_XOR */
"xor"
,
...
...
dlls/wined3d/shader_sm4.c
View file @
8c18ebf6
...
@@ -117,6 +117,7 @@ enum wined3d_sm4_opcode
...
@@ -117,6 +117,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_SQRT
=
0x4b
,
WINED3D_SM4_OP_SQRT
=
0x4b
,
WINED3D_SM4_OP_SINCOS
=
0x4d
,
WINED3D_SM4_OP_SINCOS
=
0x4d
,
WINED3D_SM4_OP_UDIV
=
0x4e
,
WINED3D_SM4_OP_UDIV
=
0x4e
,
WINED3D_SM4_OP_UGE
=
0x50
,
WINED3D_SM4_OP_USHR
=
0x55
,
WINED3D_SM4_OP_USHR
=
0x55
,
WINED3D_SM4_OP_UTOF
=
0x56
,
WINED3D_SM4_OP_UTOF
=
0x56
,
WINED3D_SM4_OP_XOR
=
0x57
,
WINED3D_SM4_OP_XOR
=
0x57
,
...
@@ -259,6 +260,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
...
@@ -259,6 +260,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{
WINED3D_SM4_OP_SQRT
,
WINED3DSIH_SQRT
,
"F"
,
"F"
},
{
WINED3D_SM4_OP_SQRT
,
WINED3DSIH_SQRT
,
"F"
,
"F"
},
{
WINED3D_SM4_OP_SINCOS
,
WINED3DSIH_SINCOS
,
"FF"
,
"F"
},
{
WINED3D_SM4_OP_SINCOS
,
WINED3DSIH_SINCOS
,
"FF"
,
"F"
},
{
WINED3D_SM4_OP_UDIV
,
WINED3DSIH_UDIV
,
"UU"
,
"UU"
},
{
WINED3D_SM4_OP_UDIV
,
WINED3DSIH_UDIV
,
"UU"
,
"UU"
},
{
WINED3D_SM4_OP_UGE
,
WINED3DSIH_UGE
,
"U"
,
"UU"
},
{
WINED3D_SM4_OP_USHR
,
WINED3DSIH_USHR
,
"U"
,
"UU"
},
{
WINED3D_SM4_OP_USHR
,
WINED3DSIH_USHR
,
"U"
,
"UU"
},
{
WINED3D_SM4_OP_UTOF
,
WINED3DSIH_UTOF
,
"F"
,
"U"
},
{
WINED3D_SM4_OP_UTOF
,
WINED3DSIH_UTOF
,
"F"
,
"U"
},
{
WINED3D_SM4_OP_XOR
,
WINED3DSIH_XOR
,
"U"
,
"UU"
},
{
WINED3D_SM4_OP_XOR
,
WINED3DSIH_XOR
,
"U"
,
"UU"
},
...
...
dlls/wined3d/wined3d_private.h
View file @
8c18ebf6
...
@@ -547,6 +547,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
...
@@ -547,6 +547,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_TEXREG2GB
,
WINED3DSIH_TEXREG2GB
,
WINED3DSIH_TEXREG2RGB
,
WINED3DSIH_TEXREG2RGB
,
WINED3DSIH_UDIV
,
WINED3DSIH_UDIV
,
WINED3DSIH_UGE
,
WINED3DSIH_USHR
,
WINED3DSIH_USHR
,
WINED3DSIH_UTOF
,
WINED3DSIH_UTOF
,
WINED3DSIH_XOR
,
WINED3DSIH_XOR
,
...
...
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