glsl_shader.c: sampler variables wrongly named 'shader'

Christoph Bumiller e0425955 at stud3.tuwien.ac.at
Mon Jan 1 12:01:42 CST 2007


This will probably fix some shader compilation errors as the sampler 
variable names are "Psampler0 etc." and not "Pshader0 etc." ...

---
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 03d5dd3..f156c43 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -827,13 +827,13 @@ static void shader_glsl_sample(SHADER_OP
         /* Note that there's no such thing as a projected cube texture. */
         switch(sampler_type) {
             case WINED3DSTT_2D:
-                shader_addline(buffer, "%s = texture2DProj(%cshader%u, 
%s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg);
+                shader_addline(buffer, "%s = 
texture2DProj(%csampler%u, %s);\n", dst_str, sampler_prefix, 
sampler_idx, coord_reg);
                 break;
             case WINED3DSTT_VOLUME:
-                shader_addline(buffer, "%s = texture3DProj(%cshader%u, 
%s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg);
+                shader_addline(buffer, "%s = 
texture3DProj(%csampler%u, %s);\n", dst_str, sampler_prefix, 
sampler_idx, coord_reg);
                 break;
             default:
-                shader_addline(buffer, "%s = 
unrecognized_stype(%cshader%u, %s);\n", dst_str, sampler_prefix, 
sampler_idx, coord_reg);
+                shader_addline(buffer, "%s = 
unrecognized_stype(%csampler%u, %s);\n", dst_str, sampler_prefix, 
sampler_idx, coord_reg);
                 FIXME("Unrecognized sampler type: %#x;\n", sampler_type);
                 break;
         }
-- 
1.4.4





More information about the wine-patches mailing list