Skip to content

W
wine-winehq
Commit 88b6d5eb authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Relative addressing tokens are always source parameters.

So the "is_src" argument to shader_dump_arr_entry() is redundant (and wrong).
parent 52644ab0
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
dlls/wined3d/baseshader.c
View file @ 88b6d5eb
...@@ -901,8 +901,7 @@ static void shader_dump_decl_usage(DWORD decl, DWORD param, DWORD shader_version ...@@ -901,8 +901,7 @@ static void shader_dump_decl_usage(DWORD decl, DWORD param, DWORD shader_version
} }
} }
static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, unsigned int reg, DWORD shader_version)
unsigned int reg, BOOL is_src, DWORD shader_version)
{ {
char relative = char relative =
((param & WINED3DSHADER_ADDRESSMODE_MASK) == WINED3DSHADER_ADDRMODE_RELATIVE); ((param & WINED3DSHADER_ADDRESSMODE_MASK) == WINED3DSHADER_ADDRMODE_RELATIVE);
...@@ -910,7 +909,7 @@ static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, ...@@ -910,7 +909,7 @@ static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token,
if (relative) { if (relative) {
TRACE("["); TRACE("[");
if (addr_token) if (addr_token)
shader_dump_param(addr_token, 0, is_src, shader_version); shader_dump_param(addr_token, 0, TRUE, shader_version);
else else
TRACE("a0.x"); TRACE("a0.x");
TRACE(" + "); TRACE(" + ");
...@@ -956,14 +955,14 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, BOOL is ...@@ -956,14 +955,14 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, BOOL is
break; break;
case WINED3DSPR_INPUT: case WINED3DSPR_INPUT:
TRACE("v"); TRACE("v");
shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); shader_dump_arr_entry(param, addr_token, reg, shader_version);
break; break;
case WINED3DSPR_CONST: case WINED3DSPR_CONST:
case WINED3DSPR_CONST2: case WINED3DSPR_CONST2:
case WINED3DSPR_CONST3: case WINED3DSPR_CONST3:
case WINED3DSPR_CONST4: case WINED3DSPR_CONST4:
TRACE("c"); TRACE("c");
shader_dump_arr_entry(param, addr_token, shader_get_float_offset(param), is_src, shader_version); shader_dump_arr_entry(param, addr_token, shader_get_float_offset(param), shader_version);
break; break;
case WINED3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */ case WINED3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */
TRACE("%c%u", (pshader? 't':'a'), reg); TRACE("%c%u", (pshader? 't':'a'), reg);
...@@ -987,18 +986,18 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, BOOL is ...@@ -987,18 +986,18 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, BOOL is
if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 3) { if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 3) {
TRACE("o"); TRACE("o");
shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); shader_dump_arr_entry(param, addr_token, reg, shader_version);
} }
else else
TRACE("oT%u", reg); TRACE("oT%u", reg);
break; break;
case WINED3DSPR_CONSTINT: case WINED3DSPR_CONSTINT:
TRACE("i"); TRACE("i");
shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); shader_dump_arr_entry(param, addr_token, reg, shader_version);
break; break;
case WINED3DSPR_CONSTBOOL: case WINED3DSPR_CONSTBOOL:
TRACE("b"); TRACE("b");
shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); shader_dump_arr_entry(param, addr_token, reg, shader_version);
break; break;
case WINED3DSPR_LABEL: case WINED3DSPR_LABEL:
TRACE("l%u", reg); TRACE("l%u", reg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment