Module: wine Branch: master Commit: 9d14dcab6866f85e99bccb1b1848fd04ad38932e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d14dcab6866f85e99bccb1b18...
Author: Stefan Dösinger stefan@codeweavers.com Date: Wed Jul 15 20:57:58 2009 +0200
wined3d: Use the unmodified source in MOVA.
The code removed by this patch was a leftover from the time when we tried to emulate MOVA with a plain ARL, which only supports one source in plain ARB. This breaks the more sophisticated MOVA and 4 component ADDR register we have now however.
---
dlls/wined3d/arb_program_shader.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0c3ffa1..f0ea0b6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1603,15 +1603,13 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) char src0_param[256];
if(ins->handler_idx == WINED3DSIH_MOVA) { - struct wined3d_shader_src_param tmp_src = ins->src[0]; char write_mask[6];
if(ctx->target_version >= NV2) { shader_hw_map2gl(ins); return; } - tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; - shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); + shader_arb_get_src_param(ins, &ins->src[0], 0, src0_param); shader_arb_get_write_mask(ins, &ins->dst[0], write_mask);
/* This implements the mova formula used in GLSL. The first two instructions