Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
a7bad0bd
Commit
a7bad0bd
authored
Sep 14, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 14, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Just handle all instructions in the shader backend.
parent
90bd04c6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
25 deletions
+14
-25
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+6
-10
glsl_shader.c
dlls/wined3d/glsl_shader.c
+8
-6
shader.c
dlls/wined3d/shader.c
+0
-9
No files found.
dlls/wined3d/arb_program_shader.c
View file @
a7bad0bd
...
...
@@ -1786,11 +1786,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins)
shader_addline
(
buffer
,
"%s%s %s%s;
\n
"
,
instruction
,
shader_arb_get_modifier
(
ins
),
dst_str
,
arguments
);
}
static
void
shader_hw_nop
(
const
struct
wined3d_shader_instruction
*
ins
)
{
struct
wined3d_shader_buffer
*
buffer
=
ins
->
ctx
->
buffer
;
shader_addline
(
buffer
,
"NOP;
\n
"
);
}
static
void
shader_hw_nop
(
const
struct
wined3d_shader_instruction
*
ins
)
{}
static
void
shader_hw_mov
(
const
struct
wined3d_shader_instruction
*
ins
)
{
...
...
@@ -5102,10 +5098,10 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_CND */
pshader_hw_cnd
,
/* WINED3DSIH_CRS */
shader_hw_map2gl
,
/* WINED3DSIH_CUT */
NULL
,
/* WINED3DSIH_DCL */
NULL
,
/* WINED3DSIH_DEF */
NULL
,
/* WINED3DSIH_DEFB */
NULL
,
/* WINED3DSIH_DEFI */
NULL
,
/* WINED3DSIH_DCL */
shader_hw_nop
,
/* WINED3DSIH_DEF */
shader_hw_nop
,
/* WINED3DSIH_DEFB */
shader_hw_nop
,
/* WINED3DSIH_DEFI */
shader_hw_nop
,
/* WINED3DSIH_DIV */
NULL
,
/* WINED3DSIH_DP2ADD */
pshader_hw_dp2add
,
/* WINED3DSIH_DP3 */
shader_hw_map2gl
,
...
...
@@ -5153,7 +5149,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_MUL */
shader_hw_map2gl
,
/* WINED3DSIH_NOP */
shader_hw_nop
,
/* WINED3DSIH_NRM */
shader_hw_nrm
,
/* WINED3DSIH_PHASE */
NULL
,
/* WINED3DSIH_PHASE */
shader_hw_nop
,
/* WINED3DSIH_POW */
shader_hw_pow
,
/* WINED3DSIH_RCP */
shader_hw_rcp
,
/* WINED3DSIH_REP */
shader_hw_rep
,
...
...
dlls/wined3d/glsl_shader.c
View file @
a7bad0bd
...
...
@@ -2301,6 +2301,8 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins)
shader_addline
(
buffer
,
"));
\n
"
);
}
static
void
shader_glsl_nop
(
const
struct
wined3d_shader_instruction
*
ins
)
{}
static
void
shader_glsl_nrm
(
const
struct
wined3d_shader_instruction
*
ins
)
{
struct
wined3d_shader_buffer
*
buffer
=
ins
->
ctx
->
buffer
;
...
...
@@ -5028,10 +5030,10 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_CND */
shader_glsl_cnd
,
/* WINED3DSIH_CRS */
shader_glsl_cross
,
/* WINED3DSIH_CUT */
NULL
,
/* WINED3DSIH_DCL */
NULL
,
/* WINED3DSIH_DEF */
NULL
,
/* WINED3DSIH_DEFB */
NULL
,
/* WINED3DSIH_DEFI */
NULL
,
/* WINED3DSIH_DCL */
shader_glsl_nop
,
/* WINED3DSIH_DEF */
shader_glsl_nop
,
/* WINED3DSIH_DEFB */
shader_glsl_nop
,
/* WINED3DSIH_DEFI */
shader_glsl_nop
,
/* WINED3DSIH_DIV */
NULL
,
/* WINED3DSIH_DP2ADD */
shader_glsl_dp2add
,
/* WINED3DSIH_DP3 */
shader_glsl_dot
,
...
...
@@ -5077,9 +5079,9 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_MOVA */
shader_glsl_mov
,
/* WINED3DSIH_MOVC */
NULL
,
/* WINED3DSIH_MUL */
shader_glsl_arith
,
/* WINED3DSIH_NOP */
NULL
,
/* WINED3DSIH_NOP */
shader_glsl_nop
,
/* WINED3DSIH_NRM */
shader_glsl_nrm
,
/* WINED3DSIH_PHASE */
NULL
,
/* WINED3DSIH_PHASE */
shader_glsl_nop
,
/* WINED3DSIH_POW */
shader_glsl_pow
,
/* WINED3DSIH_RCP */
shader_glsl_rcp
,
/* WINED3DSIH_REP */
shader_glsl_rep
,
...
...
dlls/wined3d/shader.c
View file @
a7bad0bd
...
...
@@ -1206,15 +1206,6 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_sh
continue
;
}
/* Nothing to do. */
if
(
ins
.
handler_idx
==
WINED3DSIH_DCL
||
ins
.
handler_idx
==
WINED3DSIH_NOP
||
ins
.
handler_idx
==
WINED3DSIH_DEF
||
ins
.
handler_idx
==
WINED3DSIH_DEFI
||
ins
.
handler_idx
==
WINED3DSIH_DEFB
||
ins
.
handler_idx
==
WINED3DSIH_PHASE
)
continue
;
if
(
ins
.
predicate
)
FIXME
(
"Predicates not implemented.
\n
"
);
...
...
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