Stefan Dösinger : wined3d: Get rid of a few Nvidiaisms in glsl shaders.

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Fri Nov  9 14:52:56 2007 +0100

wined3d: Get rid of a few Nvidiaisms in glsl shaders.

---

 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 01206e1..4a1c528 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -533,9 +533,9 @@ void shader_generate_glsl_declarations(
                 extra_constants_needed++;
             } else {
                 ps_impl->srgb_mode_hardcoded = 1;
-                shader_addline(buffer, "const vec4 srgb_mul_low = {%f, %f, %f, %f};\n",
+                shader_addline(buffer, "const vec4 srgb_mul_low = vec4(%f, %f, %f, %f);\n",
                                srgb_mul_low, srgb_mul_low, srgb_mul_low, srgb_mul_low);
-                shader_addline(buffer, "const vec4 srgb_comparison = {%f, %f, %f, %f};\n",
+                shader_addline(buffer, "const vec4 srgb_comparison = vec4(%f, %f, %f, %f);\n",
                                srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp);
             }
         } else {
@@ -557,7 +557,7 @@ void shader_generate_glsl_declarations(
                  * actually used, only the max limit of the shader version
                  */
                 FIXME("Cannot find a free uniform for vpos correction params\n");
-                shader_addline(buffer, "const vec4 ycorrection = {%f, %f, 0.0, 0.0};\n",
+                shader_addline(buffer, "const vec4 ycorrection = vec4(%f, %f, 0.0, 0.0);\n",
                                device->render_offscreen ? 0.0 : ((IWineD3DSurfaceImpl *) device->render_targets[0])->currentDesc.Height,
                                device->render_offscreen ? 1.0 : -1.0);
             }