wined3d: Fix D3DSIO_M#X# instruction for both ARB and GLSL shaders.

This instruction was being handled incorrectly in the case where the 2nd src argument contained a relatively addressed constant.

wined3d: Fix D3DSIO_M#X# instruction for both ARB and GLSL shaders.
3529e0ce · Jason Green · Alexandre Julliard · 05bdf67d · 3529e0ce · 3529e0ce
Commit 3529e0ce authored Jul 05, 2006 by Jason Green Committed by Alexandre Julliard Jul 06, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

arb_program_shader.c dlls/wined3d/arb_program_shader.c +1 -0

glsl_shader.c dlls/wined3d/glsl_shader.c +1 -1

No files found.
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -809,6 +809,7 @@ void vshader_hw_mnxn(SHADER_OPCODE_ARG* arg) {
    tmpArg.buffer      = arg->buffer;
    tmpArg.src[0]      = arg->src[0];
    tmpArg.src_addr[0] = arg->src_addr[0];
+    tmpArg.src_addr[1] = arg->src_addr[1];
    tmpArg.reg_maps = arg->reg_maps;

    switch(arg->opcode->opcode) {

--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -995,6 +995,7 @@ void shader_glsl_mnxn(SHADER_OPCODE_ARG* arg) {
    tmpArg.buffer      = arg->buffer;
    tmpArg.src[0]      = arg->src[0];
    tmpArg.src_addr[0] = arg->src_addr[0];
+    tmpArg.src_addr[1] = arg->src_addr[1];
    tmpArg.reg_maps = arg->reg_maps; 
    
    switch(arg->opcode->opcode) {
@@ -1025,7 +1026,6 @@ void shader_glsl_mnxn(SHADER_OPCODE_ARG* arg) {
    for (i = 0; i < nComponents; i++) {
        tmpArg.dst = ((arg->dst) & ~D3DSP_WRITEMASK_ALL)|(D3DSP_WRITEMASK_0<<i);
        tmpArg.src[1]      = arg->src[1]+i;
-	tmpArg.src_addr[1] = arg->src[1]+i;
        shader_glsl_dot(&tmpArg);
    }
 }