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/nvprogram.h | |
| 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/nvprogram.h')
| -rw-r--r-- | src/mesa/main/nvprogram.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/nvprogram.h b/src/mesa/main/nvprogram.h index 5668963da10..3a55783773b 100644 --- a/src/mesa/main/nvprogram.h +++ b/src/mesa/main/nvprogram.h @@ -74,10 +74,12 @@ extern void GLAPIENTRY _mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte *program); extern void GLAPIENTRY -_mesa_ProgramParameters4dvNV(GLenum target, GLuint index, GLuint num, const GLdouble *params); +_mesa_ProgramParameters4dvNV(GLenum target, GLuint index, GLsizei num, + const GLdouble *params); extern void GLAPIENTRY -_mesa_ProgramParameters4fvNV(GLenum target, GLuint index, GLuint num, const GLfloat *params); +_mesa_ProgramParameters4fvNV(GLenum target, GLuint index, GLsizei num, + const GLfloat *params); extern void GLAPIENTRY _mesa_TrackMatrixNV(GLenum target, GLuint address, GLenum matrix, GLenum transform); |