Henri Verbeet : wined3d: Fix the source swizzle for WINED3DSIH_EXPP.

Alexandre Julliard julliard at winehq.org
Wed Dec 11 13:05:46 CST 2013


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Dec 11 14:32:07 2013 +0100

wined3d: Fix the source swizzle for WINED3DSIH_EXPP.

---

 dlls/d3d8/tests/visual.c   |    2 +-
 dlls/wined3d/glsl_shader.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c
index 66bf241..f7afd74 100644
--- a/dlls/d3d8/tests/visual.c
+++ b/dlls/d3d8/tests/visual.c
@@ -1781,7 +1781,7 @@ static void test_scalar_instructions(IDirect3DDevice8 *device)
         {"rcp_test",    rcp_test,   D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80), FALSE},
         {"rsq_test",    rsq_test,   D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4), FALSE},
         {"exp_test",    exp_test,   D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE},
-        {"expp_test",   expp_test,  D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), TRUE},
+        {"expp_test",   expp_test,  D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE},
         {"log_test",    log_test,   D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE},
         {"logp_test",   logp_test,  D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE},
     };
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index f4d6499..f778217 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2719,7 +2719,7 @@ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins)
 {
     struct glsl_src_param src_param;
 
-    shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param);
+    shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param);
 
     if (ins->ctx->reg_maps->shader_version.major < 2)
     {




More information about the wine-cvs mailing list