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

[Chad Versace]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

While you're at it, you should add glUniform{2,3,4}ui and glUniform1uiv too.
Given that, this is
Reviewed-by: Chad Versace <chad at chad-versace.us>


On 08/15/2011 11:45 AM, Paul Berry wrote:
> 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;
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJOTEINAAoJEAIvNt057x8itzUP/3HhDD9x5Vye0FJNYTNZp1at
AA+TYJy10mnuoVVl65wZFIEFyFs6tqVHdDZnVlAmEDf0CDlZnhzB8nWUATDKInua
OUSXpHOd8djh5X8v49Wn6tHX+6MuZK1kqO4VtWo6B9DsoTYPbRrwxY1Sj5PVmlMn
hRrAUXn3FUyjJN/a/rV4Csg3IQYXl5U8kckp4bxKhkAzzcOsRcBihx7LD1jR1fFv
QBpcONtjBveS873hFjU6X0uXxcLP1Zuima4DqYdO9I8YhwlNPJA18hI96U7q3m0x
I1iGTTBjZobEJ3nBVqijyeUNe9sWO1kDOu9w3TMMEVtbds8GHXj7nF1xSjP+HHZa
8GH/el5n+t7CM+ZTw+E94tACwCnI4V5cEETsgr9QzQ6Ilmmy3OiQj5lCcm77c6Vt
ca33LzBzrIS+mknI/YGZI460W3CvI/0fFtfxpGDaUIJS4623M2DxwEYQGjxks6to
Dh4pU/ibBaqQnlLS2y0e40nE53xRrojfiGg/Zn0OSaLYzT4k3YMigSoBGocspUXy
em8FNGOJDATHtM5sAHbzm3fxHJ912eTAk6Pup22W2aiLRfOyM/2dYaP3y/rsnXVP
QsDgqmcE6NO7rx9nlwkPuWEGtCbzDUPA0JeGoNuTGoph2uizyd1VM2FAJnRwhvBe
HbYZOneiiP9BYH7E8uoL
=DFuI
-----END PGP SIGNATURE-----