Paul Gofman : wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: dc3cb001afca2afff8df517b0168dfad467579aa
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=dc3cb001afca2afff8df517b0...

Author: Paul Gofman <gofmanp(a)gmail.com>
Date:   Thu Jun 13 16:56:59 2019 +0300

wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8848
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 447c9523f84f8bc973a1080bb29d3b60e6d190f8)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/wined3d/glsl_shader.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 6f3826f8d6..dccc9ad389 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -4390,8 +4390,12 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins)
     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 = dot(%s, %s);\n",
-            src_param.param_str, src_param.param_str);
+    if (mask_size > 3)
+        shader_addline(buffer, "tmp0.x = dot(vec3(%s), vec3(%s));\n",
+                src_param.param_str, src_param.param_str);
+    else
+        shader_addline(buffer, "tmp0.x = dot(%s, %s);\n",
+                src_param.param_str, src_param.param_str);
     shader_glsl_append_dst(buffer, ins);
 
     if (mask_size > 1)