mesa: convert macros to inline functions

[mesa.git] / src / mesa / main / nvprogram.h

diff --git a/src/mesa/main/nvprogram.h b/src/mesa/main/nvprogram.h
index 035f2fe24264d4de3169c8bde3f6361bb82a5f17..3a55783773be880003d2fb5feff381b11416d1cd 100644 (file)
--- a/src/mesa/main/nvprogram.h
+++ b/src/mesa/main/nvprogram.h
@@ -30,7 +30,9 @@
 #define NVPROGRAM_H
 
 #include "glheader.h"
-#include "mtypes.h"
+
+struct gl_context;
+struct gl_program;
 
 extern void GLAPIENTRY
 _mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params);
@@ -72,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);