fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 22:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
This matches the usual convention for extension builtin variables.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2011-10-21 10:45:48 -07:00
parent 4ad8a0adec
commit 4fc9a98a0e
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glsl/builtin_variables.h
View file

@ -103,8 +103,8 @@ static const builtin_variable builtin_110_deprecated_uniforms[] = {
{ ir_var_uniform, -1, "gl_LightModelParameters", "gl_LightModel"},
/* Mesa-internal ATI_envmap_bumpmap state. */
{ ir_var_uniform, -1, "vec2", "gl_MESABumpRotMatrix0"},
{ ir_var_uniform, -1, "vec2", "gl_MESABumpRotMatrix1"},
{ ir_var_uniform, -1, "vec4", "gl_MESAFogParamsOptimized"},
{ ir_var_uniform, -1, "vec2", "gl_BumpRotMatrix0MESA"},
{ ir_var_uniform, -1, "vec2", "gl_BumpRotMatrix1MESA"},
{ ir_var_uniform, -1, "vec4", "gl_FogParamsOptimizedMESA"},
};

12
src/glsl/ir_variable.cpp
View file

@ -166,15 +166,15 @@ static struct gl_builtin_uniform_element gl_NormalScale_elements[] = {
{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 @@ const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[] = {
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),

6
src/mesa/main/ff_fragment_shader.cpp
View file

@ -1137,8 +1137,8 @@ load_texunit_bumpmap( struct texenv_fragment_program *p, GLuint unit )
ir_variable *rot_mat_0_var, *rot_mat_1_var;
ir_dereference_variable *rot_mat_0, *rot_mat_1;
rot_mat_0_var = p->shader->symbols->get_variable("gl_MESABumpRotMatrix0");
rot_mat_1_var = p->shader->symbols->get_variable("gl_MESABumpRotMatrix1");
rot_mat_0_var = p->shader->symbols->get_variable("gl_BumpRotMatrix0MESA");
rot_mat_1_var = p->shader->symbols->get_variable("gl_BumpRotMatrix1MESA");
rot_mat_0 = new(p->mem_ctx) ir_dereference_variable(rot_mat_0_var);
rot_mat_1 = new(p->mem_ctx) ir_dereference_variable(rot_mat_1_var);
@ -1229,7 +1229,7 @@ emit_fog_instructions(struct texenv_fragment_program *p,
temp = new(p->mem_ctx) ir_dereference_variable(fog_result);
fragcolor = new(p->mem_ctx) ir_swizzle(temp, 0, 1, 2, 3, 3);
oparams = p->shader->symbols->get_variable("gl_MESAFogParamsOptimized");
oparams = p->shader->symbols->get_variable("gl_FogParamsOptimizedMESA");
fogcoord = p->shader->symbols->get_variable("gl_FogFragCoord");
params = p->shader->symbols->get_variable("gl_Fog");
f = new(p->mem_ctx) ir_dereference_variable(fogcoord);