Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_load_constantsF().

Alexandre Julliard julliard at winehq.org
Fri Oct 19 13:33:53 CDT 2012


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Oct 18 22:12:50 2012 +0200

wined3d: Explicitly check the shader type in shader_glsl_load_constantsF().

---

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

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 56c2746..57119e1 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -539,7 +539,7 @@ static void shader_glsl_load_constantsF(const struct wined3d_shader *shader, con
 
     /* 1.X pshaders have the constants clamped to [-1;1] implicitly. */
     if (shader->reg_maps.shader_version.major == 1
-            && shader_is_pshader_version(shader->reg_maps.shader_version.type))
+            && shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_PIXEL)
         walk_constant_heap_clamped(gl_info, constants, constant_locations, heap, stack, version);
     else
         walk_constant_heap(gl_info, constants, constant_locations, heap, stack, version);




More information about the wine-cvs mailing list