diff options
author | Christian König <[email protected]> | 2010-11-21 19:40:52 +0100 |
---|---|---|
committer | Christian König <[email protected]> | 2010-11-21 19:40:52 +0100 |
commit | e6b71530daea3059ee362d4df51575e27e026b22 (patch) | |
tree | 8df01693aa4bf44360647d79a340cbb4156aa91a /src/mesa/main/dlist.c | |
parent | 42c7291d2cb50c2bd94dd9346a8402a24303d66d (diff) | |
parent | 5e3733fadf08178fca7c9f20a0f4783f940383aa (diff) |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
Diffstat (limited to 'src/mesa/main/dlist.c')
-rw-r--r-- | src/mesa/main/dlist.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 0c3c9fca36b..6c0c556ad8d 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -4784,9 +4784,9 @@ save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params) static void GLAPIENTRY save_ProgramParameters4dvNV(GLenum target, GLuint index, - GLuint num, const GLdouble *params) + GLsizei num, const GLdouble *params) { - GLuint i; + GLint i; for (i = 0; i < num; i++) { save_ProgramEnvParameter4dvARB(target, index + i, params + 4 * i); } @@ -4795,9 +4795,9 @@ save_ProgramParameters4dvNV(GLenum target, GLuint index, static void GLAPIENTRY save_ProgramParameters4fvNV(GLenum target, GLuint index, - GLuint num, const GLfloat *params) + GLsizei num, const GLfloat *params) { - GLuint i; + GLint i; for (i = 0; i < num; i++) { save_ProgramEnvParameter4fvARB(target, index + i, params + 4 * i); } |