[Piglit] [PATCH 5/9] Make uniform uint functions callable from piglit tests.

Paul Berry stereotype441 at gmail.com
Mon Aug 15 11:45:26 PDT 2011


This patch adds glUniform1ui and glUniform{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.
---
 tests/util/piglit-shader-gl.c |    8 ++++++++
 tests/util/piglit-util.h      |    4 ++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/tests/util/piglit-shader-gl.c b/tests/util/piglit-shader-gl.c
index 0af6425..41bfa38 100644
--- a/tests/util/piglit-shader-gl.c
+++ b/tests/util/piglit-shader-gl.c
@@ -60,6 +60,10 @@ PFNGLUNIFORM1IPROC piglit_Uniform1i = NULL;
 PFNGLUNIFORM2IVPROC piglit_Uniform2iv = NULL;
 PFNGLUNIFORM3IVPROC piglit_Uniform3iv = NULL;
 PFNGLUNIFORM4IVPROC piglit_Uniform4iv = NULL;
+PFNGLUNIFORM1UIPROC piglit_Uniform1ui = 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;
@@ -107,6 +111,10 @@ init_functions_from_core(void)
 	piglit_Uniform2iv = glUniform2iv;
 	piglit_Uniform3iv = glUniform3iv;
 	piglit_Uniform4iv = glUniform4iv;
+	piglit_Uniform1ui = glUniform1ui;
+	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 0f6b12e..282ac72 100644
--- a/tests/util/piglit-util.h
+++ b/tests/util/piglit-util.h
@@ -269,6 +269,10 @@ extern PFNGLUNIFORM1IPROC piglit_Uniform1i;
 extern PFNGLUNIFORM2IVPROC piglit_Uniform2iv;
 extern PFNGLUNIFORM3IVPROC piglit_Uniform3iv;
 extern PFNGLUNIFORM4IVPROC piglit_Uniform4iv;
+extern PFNGLUNIFORM1UIPROC piglit_Uniform1ui;
+extern PFNGLUNIFORM2UIVPROC piglit_Uniform2uiv;
+extern PFNGLUNIFORM3UIVPROC piglit_Uniform3uiv;
+extern PFNGLUNIFORM4UIVPROC piglit_Uniform4uiv;
 extern PFNGLUNIFORMMATRIX2FVPROC piglit_UniformMatrix2fv;
 extern PFNGLUNIFORMMATRIX3FVPROC piglit_UniformMatrix3fv;
 extern PFNGLUNIFORMMATRIX4FVPROC piglit_UniformMatrix4fv;
-- 
1.7.6



More information about the Piglit mailing list