diff options
author | Paul Berry <stereotype441@gmail.com> | 2011-08-12 17:52:38 -0700 |
---|---|---|
committer | Paul Berry <stereotype441@gmail.com> | 2011-08-18 13:54:26 -0700 |
commit | 1de2749f06a9a1111eb8126717c4a8d3af0327ce (patch) | |
tree | a2a9f35e1a3c67988251918c944eaa7b06074af0 | |
parent | 2b045763ccf2cea7848ed52b3e75f64faac9cefa (diff) |
Make uniform uint and int functions callable from piglit tests.
This patch adds glUniform{1,2,3,4}ui and glUniform{1,2,3,4}uiv to the
set of GL functions available through aliases beginning with
"piglit_", so that they can be called from piglit tests in the same
manner as other OpenGL functions. Also added the missing versions of
glUniform{1,2,3,4}i and glUniform{1,2,3,4}iv.
Reviewed-by: Chad Versace <chad@chad-versace.us>
-rw-r--r-- | tests/util/piglit-shader-gl.c | 24 | ||||
-rw-r--r-- | tests/util/piglit-util.h | 12 |
2 files changed, 36 insertions, 0 deletions
diff --git a/tests/util/piglit-shader-gl.c b/tests/util/piglit-shader-gl.c index 0af64255e..496e8dc81 100644 --- a/tests/util/piglit-shader-gl.c +++ b/tests/util/piglit-shader-gl.c @@ -57,9 +57,21 @@ PFNGLUNIFORM2FVPROC piglit_Uniform2fv = NULL; PFNGLUNIFORM3FVPROC piglit_Uniform3fv = NULL; PFNGLUNIFORM4FVPROC piglit_Uniform4fv = NULL; PFNGLUNIFORM1IPROC piglit_Uniform1i = NULL; +PFNGLUNIFORM2IPROC piglit_Uniform2i = NULL; +PFNGLUNIFORM3IPROC piglit_Uniform3i = NULL; +PFNGLUNIFORM4IPROC piglit_Uniform4i = NULL; +PFNGLUNIFORM1IVPROC piglit_Uniform1iv = NULL; PFNGLUNIFORM2IVPROC piglit_Uniform2iv = NULL; PFNGLUNIFORM3IVPROC piglit_Uniform3iv = NULL; PFNGLUNIFORM4IVPROC piglit_Uniform4iv = NULL; +PFNGLUNIFORM1UIPROC piglit_Uniform1ui = NULL; +PFNGLUNIFORM2UIPROC piglit_Uniform2ui = NULL; +PFNGLUNIFORM3UIPROC piglit_Uniform3ui = NULL; +PFNGLUNIFORM4UIPROC piglit_Uniform4ui = NULL; +PFNGLUNIFORM1UIVPROC piglit_Uniform1uiv = NULL; +PFNGLUNIFORM2UIVPROC piglit_Uniform2uiv = NULL; +PFNGLUNIFORM3UIVPROC piglit_Uniform3uiv = NULL; +PFNGLUNIFORM4UIVPROC piglit_Uniform4uiv = NULL; PFNGLUNIFORMMATRIX2FVPROC piglit_UniformMatrix2fv = NULL; PFNGLUNIFORMMATRIX3FVPROC piglit_UniformMatrix3fv = NULL; PFNGLUNIFORMMATRIX4FVPROC piglit_UniformMatrix4fv = NULL; @@ -104,9 +116,21 @@ init_functions_from_core(void) piglit_Uniform3fv = glUniform3fv; piglit_Uniform4fv = glUniform4fv; piglit_Uniform1i = glUniform1i; + piglit_Uniform2i = glUniform2i; + piglit_Uniform3i = glUniform3i; + piglit_Uniform4i = glUniform4i; + piglit_Uniform1iv = glUniform1iv; piglit_Uniform2iv = glUniform2iv; piglit_Uniform3iv = glUniform3iv; piglit_Uniform4iv = glUniform4iv; + piglit_Uniform1ui = glUniform1ui; + piglit_Uniform2ui = glUniform2ui; + piglit_Uniform3ui = glUniform3ui; + piglit_Uniform4ui = glUniform4ui; + piglit_Uniform1uiv = glUniform1uiv; + piglit_Uniform2uiv = glUniform2uiv; + piglit_Uniform3uiv = glUniform3uiv; + piglit_Uniform4uiv = glUniform4uiv; piglit_UniformMatrix2fv = glUniformMatrix2fv; piglit_UniformMatrix3fv = glUniformMatrix3fv; piglit_UniformMatrix4fv = glUniformMatrix4fv; diff --git a/tests/util/piglit-util.h b/tests/util/piglit-util.h index 015f960b7..a7b28fc04 100644 --- a/tests/util/piglit-util.h +++ b/tests/util/piglit-util.h @@ -280,9 +280,21 @@ extern PFNGLUNIFORM2FVPROC piglit_Uniform2fv; extern PFNGLUNIFORM3FVPROC piglit_Uniform3fv; extern PFNGLUNIFORM4FVPROC piglit_Uniform4fv; extern PFNGLUNIFORM1IPROC piglit_Uniform1i; +extern PFNGLUNIFORM2IPROC piglit_Uniform2i; +extern PFNGLUNIFORM3IPROC piglit_Uniform3i; +extern PFNGLUNIFORM4IPROC piglit_Uniform4i; +extern PFNGLUNIFORM1IVPROC piglit_Uniform1iv; extern PFNGLUNIFORM2IVPROC piglit_Uniform2iv; extern PFNGLUNIFORM3IVPROC piglit_Uniform3iv; extern PFNGLUNIFORM4IVPROC piglit_Uniform4iv; +extern PFNGLUNIFORM1UIPROC piglit_Uniform1ui; +extern PFNGLUNIFORM2UIPROC piglit_Uniform2ui; +extern PFNGLUNIFORM3UIPROC piglit_Uniform3ui; +extern PFNGLUNIFORM4UIPROC piglit_Uniform4ui; +extern PFNGLUNIFORM1UIVPROC piglit_Uniform1uiv; +extern PFNGLUNIFORM2UIVPROC piglit_Uniform2uiv; +extern PFNGLUNIFORM3UIVPROC piglit_Uniform3uiv; +extern PFNGLUNIFORM4UIVPROC piglit_Uniform4uiv; extern PFNGLUNIFORMMATRIX2FVPROC piglit_UniformMatrix2fv; extern PFNGLUNIFORMMATRIX3FVPROC piglit_UniformMatrix3fv; extern PFNGLUNIFORMMATRIX4FVPROC piglit_UniformMatrix4fv; |