H. Verbeet : wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x2pad().

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jan 16 10:07:44 CST 2007


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

Author: H. Verbeet <hverbeet at gmail.com>
Date:   Mon Jan 15 19:34:58 2007 +0100

wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x2pad().

---

 dlls/wined3d/glsl_shader.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 8eda17a..73912e4 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1622,15 +1622,15 @@ void pshader_glsl_texm3x2depth(SHADER_OP
 /** Process the WINED3DSIO_TEXM3X2PAD instruction in GLSL
  * Calculate the 1st of a 2-row matrix multiplication. */
 void pshader_glsl_texm3x2pad(SHADER_OPCODE_ARG* arg) {
-
+    DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2;
     DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK;
     SHADER_BUFFER* buffer = arg->buffer;
     char src0_str[100];
     char src0_name[50];
     char src0_mask[6];
 
-    shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_name, src0_mask, src0_str);
-    shader_addline(buffer, "tmp0.x = dot(vec3(T%u), vec3(%s));\n", reg, src0_str);
+    shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, src0_name, src0_mask, src0_str);
+    shader_addline(buffer, "tmp0.x = dot(T%u.xyz, %s);\n", reg, src0_str);
 }
 
 /** Process the WINED3DSIO_TEXM3X3PAD instruction in GLSL




More information about the wine-cvs mailing list