Henri Verbeet : wined3d: Get rid of the token field from struct wined3d_shader_src_param.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 629801bccbab2758a8971c6f45455455e202b160
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=629801bccbab2758a8971c6f45...

Author: Henri Verbeet 
Date:   Wed Apr 22 10:48:33 2009 +0200

wined3d: Get rid of the token field from struct wined3d_shader_src_param.

---

dlls/wined3d/arb_program_shader.c |    2 --
 dlls/wined3d/baseshader.c         |    1 -
 dlls/wined3d/glsl_shader.c        |    1 -
 dlls/wined3d/wined3d_private.h    |    1 -
 4 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 3ce6953..5a77f44 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -1078,7 +1078,6 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins)
             struct wined3d_shader_src_param tmp_src = ins->src[0];
             tmp_src.swizzle = ((ins->src[0].swizzle >> WINED3DSP_SWIZZLE_SHIFT) & 0x3)
                     * (0x55 << WINED3DSP_SWIZZLE_SHIFT);
-            tmp_src.token = (tmp_src.token & ~WINED3DSP_SWIZZLE_MASK) | tmp_src.swizzle;
             shader_arb_add_src_param(ins, &tmp_src, src0_param);
             shader_addline(buffer, "ARL A0.x, %s;\n", src0_param);
         }
@@ -1627,7 +1626,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins)
         tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i;
         shader_hw_map2gl(&tmp_ins);
         ++tmp_src[1].register_idx;
-        ++tmp_src[1].token;
     }
 }

diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index 05cbe9e..ceb2473 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -248,7 +248,6 @@ static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_
     src->swizzle = param & WINED3DSP_SWIZZLE_MASK;
     src->modifiers = param & WINED3DSP_SRCMOD_MASK;
     src->rel_addr = rel_addr;
-    src->token = param;
 }

/* Note that this does not count the loop register
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 823097d..e5affd2 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2122,7 +2122,6 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins)
         tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i;
         shader_glsl_dot(&tmp_ins);
         ++tmp_src[1].register_idx;
-        ++tmp_src[1].token;
     }
 }

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b7bf220..758193e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -468,7 +468,6 @@ struct wined3d_shader_src_param
     DWORD swizzle;
     DWORD modifiers;
     const struct wined3d_shader_src_param *rel_addr;
-    DWORD token;
 };

struct wined3d_shader_instruction