commit 4fc9a98a0e01195202cd5f3f5a78cf28c5e8843c
author Eric Anholt <eric@anholt.net> Fri Oct 21 10:45:48 2011 -0700
committer Eric Anholt <eric@anholt.net> Wed Oct 26 12:52:11 2011 -0700
tree b953cfc0ba023e77fca18eee62052a54abb94d7f
parent 4ad8a0adec588b4c2c5a8f93265ed46cee5d3ff6

glsl: Rename remaining internal builtins from gl_MESA* to gl_*MESA.

This matches the usual convention for extension builtin variables.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

src/glsl/ir_variable.cpp

diff --git a/src/glsl/ir_variable.cpp b/src/glsl/ir_variable.cpp
index 8337e15..1ee84d2 100644
--- a/src/glsl/ir_variable.cpp
+++ b/src/glsl/ir_variable.cpp
@@ -166,15 +166,15 @@
    {NULL, {STATE_NORMAL_SCALE}, SWIZZLE_XXXX},
 };
 
-static struct gl_builtin_uniform_element gl_MESABumpRotMatrix0_elements[] = {
+static struct gl_builtin_uniform_element gl_BumpRotMatrix0MESA_elements[] = {
    {NULL, {STATE_INTERNAL, STATE_ROT_MATRIX_0}, SWIZZLE_XYZW},
 };
 
-static struct gl_builtin_uniform_element gl_MESABumpRotMatrix1_elements[] = {
+static struct gl_builtin_uniform_element gl_BumpRotMatrix1MESA_elements[] = {
    {NULL, {STATE_INTERNAL, STATE_ROT_MATRIX_1}, SWIZZLE_XYZW},
 };
 
-static struct gl_builtin_uniform_element gl_MESAFogParamsOptimized_elements[] = {
+static struct gl_builtin_uniform_element gl_FogParamsOptimizedMESA_elements[] = {
    {NULL, {STATE_INTERNAL, STATE_FOG_PARAMS_OPTIMIZED}, SWIZZLE_XYZW},
 };
 
@@ -289,9 +289,9 @@
    STATEVAR(gl_NormalMatrix),
    STATEVAR(gl_NormalScale),
 
-   STATEVAR(gl_MESABumpRotMatrix0),
-   STATEVAR(gl_MESABumpRotMatrix1),
-   STATEVAR(gl_MESAFogParamsOptimized),
+   STATEVAR(gl_BumpRotMatrix0MESA),
+   STATEVAR(gl_BumpRotMatrix1MESA),
+   STATEVAR(gl_FogParamsOptimizedMESA),
    STATEVAR(gl_CurrentAttribVertMESA),
    STATEVAR(gl_CurrentAttribFragMESA),