Henri Verbeet : wined3d: Simplify the generated GLSL for NRM.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Fri Mar 19 13:19:50 2010 +0100

wined3d: Simplify the generated GLSL for NRM.

---

 dlls/wined3d/glsl_shader.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 2d057f7..9bce13b 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2164,16 +2164,26 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins)
 {
     struct wined3d_shader_buffer *buffer = ins->ctx->buffer;
     glsl_src_param_t src_param;
+    unsigned int mask_size;
     DWORD write_mask;
     char dst_mask[6];
 
     write_mask = shader_glsl_get_write_mask(ins->dst, dst_mask);
+    mask_size = shader_glsl_get_write_mask_size(write_mask);
     shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param);
 
     shader_addline(buffer, "tmp0.x = length(%s);\n", src_param.param_str);
     shader_glsl_append_dst(buffer, ins);
-    shader_addline(buffer, "tmp0.x == 0.0 ? (%s * FLT_MAX) : (%s / tmp0.x));",
-            src_param.param_str, src_param.param_str);
+    if (mask_size > 1)
+    {
+        shader_addline(buffer, "tmp0.x == 0.0 ? vec%u(0.0) : (%s / tmp0.x));\n",
+                mask_size, src_param.param_str);
+    }
+    else
+    {
+        shader_addline(buffer, "tmp0.x == 0.0 ? 0.0 : (%s / tmp0.x));\n",
+                src_param.param_str);
+    }
 }
 
 /** Process the WINED3DSIO_EXPP instruction in GLSL: