Mesa (master): mesa: fix warnings about locals hiding function params
Brian Paul
brianp at kemper.freedesktop.org
Fri Aug 14 17:31:38 UTC 2009
Module: Mesa
Branch: master
Commit: ecb177eaea20f3464b08dfc4d94a3194482cf73d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ecb177eaea20f3464b08dfc4d94a3194482cf73d
Author: Brian Paul <brianp at vmware.com>
Date: Thu Aug 13 14:05:52 2009 -0600
mesa: fix warnings about locals hiding function params
---
src/mesa/main/dlist.c | 6 +++---
src/mesa/main/light.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 2e36eee..f8fdd70 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -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));
}
}
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 1703468..7479fe8 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -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 );
}
}
More information about the mesa-commit
mailing list