mesa: fix warnings about locals hiding function params
This commit is contained in:
@@ -1016,7 +1016,7 @@ _mesa_save_CallList(GLuint list)
|
||||
|
||||
|
||||
void GLAPIENTRY
|
||||
_mesa_save_CallLists(GLsizei n, GLenum type, const GLvoid * lists)
|
||||
_mesa_save_CallLists(GLsizei num, GLenum type, const GLvoid * lists)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
GLint i;
|
||||
@@ -1041,7 +1041,7 @@ _mesa_save_CallLists(GLsizei n, GLenum type, const GLvoid * lists)
|
||||
typeErrorFlag = GL_TRUE;
|
||||
}
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
for (i = 0; i < num; i++) {
|
||||
GLint list = translate_id(i, type, lists);
|
||||
Node *n = ALLOC_INSTRUCTION(ctx, OPCODE_CALL_LIST_OFFSET, 2);
|
||||
if (n) {
|
||||
@@ -1056,7 +1056,7 @@ _mesa_save_CallLists(GLsizei n, GLenum type, const GLvoid * lists)
|
||||
invalidate_saved_current_state( ctx );
|
||||
|
||||
if (ctx->ExecuteFlag) {
|
||||
CALL_CallLists(ctx->Exec, (n, type, lists));
|
||||
CALL_CallLists(ctx->Exec, (num, type, lists));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1224,15 +1224,15 @@ _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state )
|
||||
ctx->Driver.LightingSpaceChange( ctx );
|
||||
}
|
||||
else {
|
||||
GLuint new_state = ctx->NewState;
|
||||
GLuint new_state2 = ctx->NewState;
|
||||
|
||||
/* Recalculate that same state only if it has been invalidated
|
||||
* by other statechanges.
|
||||
*/
|
||||
if (new_state & _NEW_MODELVIEW)
|
||||
if (new_state2 & _NEW_MODELVIEW)
|
||||
update_modelview_scale(ctx);
|
||||
|
||||
if (new_state & (_NEW_LIGHT|_NEW_MODELVIEW))
|
||||
if (new_state2 & (_NEW_LIGHT|_NEW_MODELVIEW))
|
||||
compute_light_positions( ctx );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user