Henri Verbeet : wined3d: Get rid of the vpos_uniform field from the wined3d_pixel_shader structure.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Sun Jul 24 21:48:09 2011 +0200

wined3d: Get rid of the vpos_uniform field from the wined3d_pixel_shader structure.

---

 dlls/wined3d/glsl_shader.c     |    3 +--
 dlls/wined3d/wined3d_private.h |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index d421e65..5694d4c 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -823,7 +823,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context,
             }
         }
 
-        if (pshader->u.ps.vpos_uniform)
+        if (prog->ycorrection_location != -1)
         {
             float correction_params[4];
 
@@ -1043,7 +1043,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
                     + 1 < gl_info->limits.glsl_ps_float_constants)
             {
                 shader_addline(buffer, "uniform vec4 ycorrection;\n");
-                shader->u.ps.vpos_uniform = 1;
                 extra_constants_needed++;
             }
             else
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 77ea8c2..0de11a4 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2566,7 +2566,6 @@ struct wined3d_pixel_shader
     unsigned int declared_in_count;
 
     /* Some information about the shader behavior */
-    char vpos_uniform;
     BOOL color0_mov;
     DWORD color0_reg;
 };