summaryrefslogtreecommitdiff
path: root/src/mesa/shader/shaderobjects.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-11-03 21:30:16 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-11-03 21:30:16 +0000
commit2659ee9dfb32f76ae2b93d0d7234053a246d400a (patch)
treef33e1319ee86067edea8340218cb2830a48cb705 /src/mesa/shader/shaderobjects.h
parentc64a06291817d8667eddc538abdbf5de2f011961 (diff)
Use inlined uniform() helper function in all the glUniform*() function to
reduce duplicated code. Finish up _program_ReadUniform() for non-float types. Implement _mesa_GetUniformivARB(). Simplify the _program_WriteUniform() function a bit.
Diffstat (limited to 'src/mesa/shader/shaderobjects.h')
-rw-r--r--src/mesa/shader/shaderobjects.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/shaderobjects.h b/src/mesa/shader/shaderobjects.h
index 3afd0c9b29..09ba807255 100644
--- a/src/mesa/shader/shaderobjects.h
+++ b/src/mesa/shader/shaderobjects.h
@@ -105,7 +105,7 @@ struct gl2_program_intf
GLboolean (* WriteUniform) (struct gl2_program_intf **, GLint loc, GLsizei count,
const GLvoid *data, GLenum type);
GLboolean (* ReadUniform) (struct gl2_program_intf **, GLint loc, GLsizei count,
- GLfloat *data);
+ GLvoid *data, GLenum type);
GLvoid (* GetActiveAttrib) (struct gl2_program_intf **, GLuint index, GLsizei maxLength,
GLsizei *length, GLint *size, GLenum *type, GLchar *name);
GLuint (* GetActiveAttribMaxLength) (struct gl2_program_intf **);