[Piglit] [PATCH 6/7] Add ARB_shader_objects wrapper for glGetActiveUniform().

Eric Anholt eric at anholt.net
Mon Jul 11 17:43:12 PDT 2011


---
 tests/util/piglit-shader-gl.c |    3 +++
 tests/util/piglit-util.h      |    2 ++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/tests/util/piglit-shader-gl.c b/tests/util/piglit-shader-gl.c
index 6ce255b..bfe9fe4 100644
--- a/tests/util/piglit-shader-gl.c
+++ b/tests/util/piglit-shader-gl.c
@@ -38,6 +38,7 @@ PFNGLCREATEPROGRAMPROC piglit_CreateProgram = NULL;
 PFNGLCREATESHADERPROC piglit_CreateShader = NULL;
 PFNGLDELETEPROGRAMPROC piglit_DeleteProgram = NULL;
 PFNGLDELETESHADERPROC piglit_DeleteShader = NULL;
+PFNGLGETACTIVEUNIFORMPROC piglit_GetActiveUniform = NULL;
 PFNGLGETPROGRAMINFOLOGPROC piglit_GetProgramInfoLog = NULL;
 PFNGLGETPROGRAMIVPROC piglit_GetProgramiv = NULL;
 PFNGLGETSHADERINFOLOGPROC piglit_GetShaderInfoLog = NULL;
@@ -83,6 +84,7 @@ init_functions_from_core(void)
 	piglit_CreateShader = glCreateShader;
 	piglit_DeleteProgram = glDeleteProgram;
 	piglit_DeleteShader = glDeleteShader;
+	piglit_GetActiveUniform = glGetActiveUniform;
 	piglit_GetProgramInfoLog = glGetProgramInfoLog;
 	piglit_GetProgramiv = glGetProgramiv;
 	piglit_GetShaderInfoLog = glGetShaderInfoLog;
@@ -131,6 +133,7 @@ init_functions_from_extension(void)
 	piglit_CreateShader = glCreateShaderObjectARB;
 	piglit_DeleteProgram = glDeleteObjectARB;
 	piglit_DeleteShader = glDeleteObjectARB;
+	piglit_GetActiveUniform = glGetActiveUniformARB;
 	piglit_GetProgramInfoLog = glGetInfoLogARB;
 	piglit_GetProgramiv = glGetObjectParameterivARB;
 	piglit_GetShaderInfoLog = glGetInfoLogARB;
diff --git a/tests/util/piglit-util.h b/tests/util/piglit-util.h
index 130a973..e877c71 100644
--- a/tests/util/piglit-util.h
+++ b/tests/util/piglit-util.h
@@ -204,6 +204,7 @@ extern GLint piglit_ARBfp_pass_through;
 #define piglit_CreateShader glCreateShader
 #define piglit_DeleteProgram glDeleteProgram
 #define piglit_DeleteShader glDeleteShader
+#define piglit_GetActiveUniform glGetActiveUniform
 #define piglit_GetProgramInfoLog glGetProgramInfoLog
 #define piglit_GetProgramiv glGetProgramiv
 #define piglit_GetShaderInfoLog glGetShaderInfoLog
@@ -245,6 +246,7 @@ extern PFNGLCREATEPROGRAMPROC piglit_CreateProgram;
 extern PFNGLCREATESHADERPROC piglit_CreateShader;
 extern PFNGLDELETEPROGRAMPROC piglit_DeleteProgram;
 extern PFNGLDELETESHADERPROC piglit_DeleteShader;
+extern PFNGLGETACTIVEUNIFORMPROC piglit_GetActiveUniform;
 extern PFNGLGETPROGRAMINFOLOGPROC piglit_GetProgramInfoLog;
 extern PFNGLGETPROGRAMIVPROC piglit_GetProgramiv;
 extern PFNGLGETSHADERINFOLOGPROC piglit_GetShaderInfoLog;
-- 
1.7.5.4



More information about the Piglit mailing list