Skip to content

Commit

Permalink
Shrunk variable name to fit draconian 80-char standards.
Browse files Browse the repository at this point in the history
--HG--
branch : trunk
  • Loading branch information
icculus committed May 11, 2008
1 parent 66bc6a5 commit f1ad0e3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions mojoshader_opengl.c
Expand Up @@ -626,7 +626,7 @@ MOJOSHADER_glProgram *MOJOSHADER_glLinkProgram(MOJOSHADER_glShader *vshader,
MOJOSHADER_glProgram *retval = NULL;
const GLhandleARB program = ctx->glCreateProgramObject();
int numregs = 0;
int const_count = 0;
int consts = 0;

if (vshader != NULL) ctx->glAttachObject(program, vshader->handle);
if (pshader != NULL) ctx->glAttachObject(program, pshader->handle);
Expand Down Expand Up @@ -670,8 +670,8 @@ MOJOSHADER_glProgram *MOJOSHADER_glLinkProgram(MOJOSHADER_glShader *vshader,

if (vshader != NULL)
{
if (const_count < vshader->parseData->constant_count)
const_count = vshader->parseData->constant_count;
if (consts < vshader->parseData->constant_count)
consts = vshader->parseData->constant_count;
retval->attributes = (AttributeMap *) Malloc(sizeof (AttributeMap) *
vshader->parseData->attribute_count);
if (retval->attributes == NULL)
Expand All @@ -685,20 +685,20 @@ MOJOSHADER_glProgram *MOJOSHADER_glLinkProgram(MOJOSHADER_glShader *vshader,

if (pshader != NULL)
{
if (const_count < pshader->parseData->constant_count)
const_count = pshader->parseData->constant_count;
if (consts < pshader->parseData->constant_count)
consts = pshader->parseData->constant_count;

lookup_uniforms(retval, pshader);
lookup_samplers(retval, vshader);
pshader->refcount++;
} // if

if (const_count > 0)
if (consts > 0)
{
retval->constants = (GLfloat *) Malloc(sizeof (GLfloat) * const_count * 4);
retval->constants = (GLfloat *) Malloc(sizeof (GLfloat) * consts * 4);
if (retval->constants == NULL)
goto link_program_fail;
retval->constant_count = (uint32) const_count;
retval->constant_count = (uint32) consts;
} // if

return retval;
Expand Down

0 comments on commit f1ad0e3

Please sign in to comment.