glsl_shader.c: sampler variables wrongly named 'shader' (resend)

[Christoph Bumiller]

Sorry, the patch/text got accidentally screwed up ... here again as 
attachement, although changing this manually would probably be faster 
than applying a patch; just so no one complains ...

-------------- next part --------------
>From 11531f221683bd8442553fda7db31efaf0de05a0 Mon Sep 17 00:00:00 2001
From: Christoph Bumiller <chr at ECHELON.(none)>
Date: Mon, 1 Jan 2007 18:49:41 +0100
Subject: Fix naming of sampler variables in GLSL output of shader_glsl_sample

---
 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