Commit 8c867768 authored by Eric Anholt's avatar Eric Anholt

Add ARB_shader_objects wrappers for glUniform[1234]f().

There were a few tests that wanted them on 915.
Reviewed-by: default avatarIan Romanick <ian.d.romanick@intel.com>
Reviewed-by: chadversary's avatarChad Versace <chad@chad-versace.us>
parent 799148e1
......@@ -46,6 +46,10 @@ PFNGLGETUNIFORMLOCATIONPROC piglit_GetUniformLocation = NULL;
PFNGLLINKPROGRAMPROC piglit_LinkProgram = NULL;
PFNGLSHADERSOURCEPROC piglit_ShaderSource = NULL;
PFNGLUSEPROGRAMPROC piglit_UseProgram = NULL;
PFNGLUNIFORM1FPROC piglit_Uniform1f = NULL;
PFNGLUNIFORM2FPROC piglit_Uniform2f = NULL;
PFNGLUNIFORM3FPROC piglit_Uniform3f = NULL;
PFNGLUNIFORM4FPROC piglit_Uniform4f = NULL;
PFNGLUNIFORM1FVPROC piglit_Uniform1fv = NULL;
PFNGLUNIFORM2FVPROC piglit_Uniform2fv = NULL;
PFNGLUNIFORM3FVPROC piglit_Uniform3fv = NULL;
......@@ -87,6 +91,10 @@ init_functions_from_core(void)
piglit_LinkProgram = glLinkProgram;
piglit_ShaderSource = glShaderSource;
piglit_UseProgram = glUseProgram;
piglit_Uniform1f = glUniform1f;
piglit_Uniform2f = glUniform2f;
piglit_Uniform3f = glUniform3f;
piglit_Uniform4f = glUniform4f;
piglit_Uniform1fv = glUniform1fv;
piglit_Uniform2fv = glUniform2fv;
piglit_Uniform3fv = glUniform3fv;
......@@ -131,6 +139,10 @@ init_functions_from_extension(void)
piglit_LinkProgram = glLinkProgramARB;
piglit_ShaderSource = glShaderSourceARB;
piglit_UseProgram = glUseProgramObjectARB;
piglit_Uniform1f = glUniform1fARB;
piglit_Uniform2f = glUniform2fARB;
piglit_Uniform3f = glUniform3fARB;
piglit_Uniform4f = glUniform4fARB;
piglit_Uniform1fv = glUniform1fvARB;
piglit_Uniform2fv = glUniform2fvARB;
piglit_Uniform3fv = glUniform3fvARB;
......
......@@ -212,6 +212,10 @@ extern GLint piglit_ARBfp_pass_through;
#define piglit_LinkProgram glLinkProgram
#define piglit_ShaderSource glShaderSource
#define piglit_UseProgram glUseProgram
#define piglit_Uniform1f glUniform1f
#define piglit_Uniform2f glUniform2f
#define piglit_Uniform3f glUniform3f
#define piglit_Uniform4f glUniform4f
#define piglit_Uniform1fv glUniform1fv
#define piglit_Uniform2fv glUniform2fv
#define piglit_Uniform3fv glUniform3fv
......@@ -249,6 +253,10 @@ extern PFNGLGETUNIFORMLOCATIONPROC piglit_GetUniformLocation;
extern PFNGLLINKPROGRAMPROC piglit_LinkProgram;
extern PFNGLSHADERSOURCEPROC piglit_ShaderSource;
extern PFNGLUSEPROGRAMPROC piglit_UseProgram;
extern PFNGLUNIFORM1FPROC piglit_Uniform1f;
extern PFNGLUNIFORM2FPROC piglit_Uniform2f;
extern PFNGLUNIFORM3FPROC piglit_Uniform3f;
extern PFNGLUNIFORM4FPROC piglit_Uniform4f;
extern PFNGLUNIFORM1FVPROC piglit_Uniform1fv;
extern PFNGLUNIFORM2FVPROC piglit_Uniform2fv;
extern PFNGLUNIFORM3FVPROC piglit_Uniform3fv;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment