From: Dave Airlie Date: Sat, 15 Sep 2012 03:26:39 +0000 (+1000) Subject: glsl: make _mesa_builtin_uniform_desc static X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ce9f25fde5fc33566f4effbb94d342a20d50256;p=mesa.git glsl: make _mesa_builtin_uniform_desc static I can't see any reason this is global (unless for debugging) Reviewed-by: Matt Turner Signed-off-by: Dave Airlie --- diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index 03b64c931a4..353805b7ffe 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/glsl/builtin_variables.cpp @@ -328,7 +328,7 @@ static struct gl_builtin_uniform_element gl_NormalMatrix_elements[] = { #define STATEVAR(name) {#name, name ## _elements, Elements(name ## _elements)} -const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[] = { +static const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[] = { STATEVAR(gl_DepthRange), STATEVAR(gl_ClipPlane), STATEVAR(gl_Point), diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index bb05524765f..e84964c6fc9 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -244,8 +244,6 @@ struct gl_builtin_uniform_desc { unsigned int num_elements; }; -extern const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[]; - /** * \name GLSL uniform arrays and structs require special handling. *