Christoph Bumiller : wined3d: Sampler variables wrongly named
'shader'.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jan 3 05:37:28 CST 2007
Module: wine
Branch: master
Commit: d905795503f28f8725c0f41bfb27479818bb5468
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d905795503f28f8725c0f41bfb27479818bb5468
Author: Christoph Bumiller <e0425955 at stud3.tuwien.ac.at>
Date: Tue Jan 2 11:01:51 2007 +0100
wined3d: Sampler variables wrongly named 'shader'.
---
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 4aed644..fd44111 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -843,13 +843,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;
}
More information about the wine-cvs
mailing list