glsl: make _mesa_builtin_uniform_desc static

I can't see any reason this is global (unless for debugging)

Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 03b64c931a4f691d1db2960556beb101d16db0d5..353805b7ffecb1dffab29949113a7a961e98f802 100644 (file)
--- 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 bb05524765fa53c0c03026e03bd7621d496fe1f5..e84964c6fc98cad054df0d20729a4d92c6f1b4a8 100644 (file)
--- 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.
  *