diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-27 08:32:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-27 08:32:52 +0200 |
| commit | d662d461634660f5c0f3998b5eb7d7ed3bd5a25f (patch) | |
| tree | acb25086e94250ff8edf746705bdffb5551c00d8 /mesalib/src/mesa/main/ff_fragment_shader.cpp | |
| parent | 4f005bade376d15ee60e90ca45a831aff9725087 (diff) | |
| download | vcxsrv-d662d461634660f5c0f3998b5eb7d7ed3bd5a25f.tar.gz vcxsrv-d662d461634660f5c0f3998b5eb7d7ed3bd5a25f.tar.bz2 vcxsrv-d662d461634660f5c0f3998b5eb7d7ed3bd5a25f.zip | |
mesa git update 27 okt 2011
Diffstat (limited to 'mesalib/src/mesa/main/ff_fragment_shader.cpp')
| -rw-r--r-- | mesalib/src/mesa/main/ff_fragment_shader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp index 3e449b03e..b5500714b 100644 --- a/mesalib/src/mesa/main/ff_fragment_shader.cpp +++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp @@ -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); |