Fabian Bieler : wined3d: Fix GLSL cnd instruction.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Apr 5 06:42:53 CDT 2007


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

Author: Fabian Bieler <der.fabe at gmx.net>
Date:   Thu Apr  5 00:26:35 2007 +0200

wined3d: Fix GLSL cnd instruction.

According to MSDN the cnd instruction should translate:
dst = src0 > 0.5 ? src1 : src2;

---

 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 3ceb935..5700902 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1148,7 +1148,7 @@ void shader_glsl_cmp(SHADER_OPCODE_ARG* arg) {
     }
 }
 
-/** Process the CND opcode in GLSL (dst = (src0 < 0.5) ? src1 : src2) */
+/** Process the CND opcode in GLSL (dst = (src0 > 0.5) ? src1 : src2) */
 /* For ps 1.1-1.3, only a single component of src0 is used. For ps 1.4
  * the compare is done per component of src0. */
 void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) {
@@ -1164,7 +1164,7 @@ void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) {
         shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param);
         shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param);
         shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param);
-        shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n",
+        shader_addline(arg->buffer, "%s > 0.5 ? %s : %s);\n",
                 src0_param.param_str, src1_param.param_str, src2_param.param_str);
         return;
     }
@@ -1185,7 +1185,7 @@ void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) {
         shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param);
         shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param);
 
-        shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n",
+        shader_addline(arg->buffer, "%s > 0.5 ? %s : %s);\n",
                 src0_param.param_str, src1_param.param_str, src2_param.param_str);
     }
 }




More information about the wine-cvs mailing list