Mesa (master): glsl: make _mesa_builtin_uniform_desc static

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 1ce9f25fde5fc33566f4effbb94d342a20d50256
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ce9f25fde5fc33566f4effbb94d342a20d50256

Author: Dave Airlie <airlied at gmail.com>
Date:   Sat Sep 15 13:26:39 2012 +1000

glsl: make _mesa_builtin_uniform_desc static

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

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

---

 src/glsl/builtin_variables.cpp |    2 +-
 src/mesa/main/uniforms.h       |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 03b64c9..353805b 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 bb05524..e84964c 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.
  *