Stefan Dösinger : wined3d: Give local constants a shader type prefix.
Alexandre Julliard
julliard at winehq.org
Tue Jun 3 04:52:21 CDT 2008
Module: wine
Branch: master
Commit: e4413f201266f064d0807b8a73bb07c653ee0c3a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4413f201266f064d0807b8a73bb07c653ee0c3a
Author: Stefan Dösinger <stefandoesinger at gmx.at>
Date: Mon Jun 2 21:12:27 2008 +0200
wined3d: Give local constants a shader type prefix.
---
dlls/wined3d/glsl_shader.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index ebf3c09..a0c793b 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -703,7 +703,7 @@ void shader_generate_glsl_declarations(
if(!This->baseShader.load_local_constsF) {
LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) {
float *value = (float *) lconst->value;
- shader_addline(buffer, "const vec4 LC%u = vec4(%f, %f, %f, %f);\n", lconst->idx,
+ shader_addline(buffer, "const vec4 %cLC%u = vec4(%f, %f, %f, %f);\n", prefix, lconst->idx,
value[0], value[1], value[2], value[3]);
}
}
@@ -878,7 +878,7 @@ static void shader_glsl_get_register_name(
break;
case WINED3DSPR_CONST:
{
- const char* prefix = pshader? "PC":"VC";
+ const char prefix = pshader? 'P':'V';
/* Relative addressing */
if (param & WINED3DSHADER_ADDRMODE_RELATIVE) {
@@ -889,23 +889,23 @@ static void shader_glsl_get_register_name(
glsl_src_param_t rel_param;
shader_glsl_add_src_param(arg, addr_token, 0, WINED3DSP_WRITEMASK_0, &rel_param);
if(reg) {
- sprintf(tmpStr, "%s[%s + %u]", prefix, rel_param.param_str, reg);
+ sprintf(tmpStr, "%cC[%s + %u]", prefix, rel_param.param_str, reg);
} else {
- sprintf(tmpStr, "%s[%s]", prefix, rel_param.param_str);
+ sprintf(tmpStr, "%cC[%s]", prefix, rel_param.param_str);
}
} else {
if(reg) {
- sprintf(tmpStr, "%s[A0.x + %u]", prefix, reg);
+ sprintf(tmpStr, "%cC[A0.x + %u]", prefix, reg);
} else {
- sprintf(tmpStr, "%s[A0.x]", prefix);
+ sprintf(tmpStr, "%cC[A0.x]", prefix);
}
}
} else {
if(shader_constant_is_local(This, reg)) {
- sprintf(tmpStr, "LC%u", reg);
+ sprintf(tmpStr, "%cLC%u", prefix, reg);
} else {
- sprintf(tmpStr, "%s[%u]", prefix, reg);
+ sprintf(tmpStr, "%cC[%u]", prefix, reg);
}
}
More information about the wine-cvs
mailing list