Commit 629801bc authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

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

parent 7a3d4ce7
......@@ -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;
}
}
......
......@@ -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
......
......@@ -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;
}
}
......
......@@ -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
......
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