Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed relative addressing in GLSL profile.
It was using wrong variable name ("a0" instead of "vs_a0").

--HG--
branch : trunk
  • Loading branch information
icculus committed May 4, 2008
1 parent c59f17e commit 037ffd3
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions mojoshader.c
Expand Up @@ -1836,7 +1836,6 @@ static char *make_GLSL_srcarg_string(Context *ctx, const int idx,
const char *rel_lbracket = "";
const char *rel_rbracket = "";
char rel_swizzle[4] = { '\0' };
char rel_regnum_str[16] = { '\0' };
const char *rel_regtype_str = "";
if (arg->relative)
{
Expand All @@ -1845,10 +1844,8 @@ static char *make_GLSL_srcarg_string(Context *ctx, const int idx,
rel_swizzle[2] = '\0';
rel_lbracket = "[";
rel_rbracket = "]";
rel_regtype_str = get_GLSL_register_string(ctx, arg->relative_regtype,
arg->relative_regnum,
rel_regnum_str,
sizeof (rel_regnum_str));
rel_regtype_str = get_GLSL_varname(ctx, arg->relative_regtype,
arg->relative_regnum);

if (regtype_str == NULL)
{
Expand All @@ -1873,9 +1870,9 @@ static char *make_GLSL_srcarg_string(Context *ctx, const int idx,

const char *shader_type_str = get_shader_type_string(ctx);
char *retval = get_scratch_buffer(ctx);
snprintf(retval, SCRATCH_BUFFER_SIZE, "%s%s_%s%s%s%s%s%s%s%s%s",
snprintf(retval, SCRATCH_BUFFER_SIZE, "%s%s_%s%s%s%s%s%s%s%s",
premod_str, shader_type_str, regtype_str, regnum_str,
rel_lbracket, rel_regtype_str, rel_regnum_str, rel_swizzle,
rel_lbracket, rel_regtype_str, rel_swizzle,
rel_rbracket, swiz_str, postmod_str);
// !!! FIXME: make sure the scratch buffer was large enough.
return retval;
Expand Down

0 comments on commit 037ffd3

Please sign in to comment.