diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3ce6953d6e1..5a77f44a8cd 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 05cbe9eef47..ceb2473fd65 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 823097d2c93..e5affd28a9e 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 b7bf220905a..758193e8c2d 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