Henri Verbeet : wined3d: Relative addressing tokens are always source parameters.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 88b6d5eb0bca5d6b66e53957b45aaa0831324319
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=88b6d5eb0bca5d6b66e53957b4...

Author: Henri Verbeet 
Date:   Wed Apr 29 09:55:07 2009 +0200

wined3d: Relative addressing tokens are always source parameters.

So the "is_src" argument to shader_dump_arr_entry() is redundant (and wrong).

---

dlls/wined3d/baseshader.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index a1bd859..ba4a918 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -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,
-        unsigned int reg, BOOL is_src, DWORD shader_version)
+static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, unsigned int reg, DWORD shader_version)
 {
     char 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,
     if (relative) {
         TRACE("[");
         if (addr_token)
-            shader_dump_param(addr_token, 0, is_src, shader_version);
+            shader_dump_param(addr_token, 0, TRUE, shader_version);
         else
             TRACE("a0.x");
         TRACE(" + ");
@@ -956,14 +955,14 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, BOOL is
             break;
         case WINED3DSPR_INPUT:
             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;
         case WINED3DSPR_CONST:
         case WINED3DSPR_CONST2:
         case WINED3DSPR_CONST3:
         case WINED3DSPR_CONST4:
             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;
         case WINED3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */
             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

if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 3) {
                 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 
                TRACE("oT%u", reg);
             break;
         case WINED3DSPR_CONSTINT:
             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;
         case WINED3DSPR_CONSTBOOL:
             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;
         case WINED3DSPR_LABEL:
             TRACE("l%u", reg);