KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/main: remove leftover bumpmap code 

This variable is only ever written as NULL, so we can omit it entirely.

Fixes: 4000c0112a ("Remove the ATI_envmap_bumpmap extension")
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6473>
This commit is contained in:
Erik Faye-Lund 2020-08-26 18:40:02 +02:00 committed by Marge Bot
parent 9c65f1f111
commit 92ff89f6f5
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/main/ff_fragment_shader.cpp
View File

@ -347,13 +347,6 @@ public:
* else undef.
*/
/* Texcoord override from bumpmapping. */
ir_variable *texcoord_tex[MAX_TEXTURE_COORD_UNITS];
/* Reg containing texcoord for a texture unit,
* needed for bump mapping, else undef.
*/
ir_rvalue *src_previous; /**< Reg containing color from previous
* stage. May need to be decl'd.
*/
@ -734,8 +727,6 @@ static void load_texture( texenv_fragment_program *p, GLuint unit )
if (!(p->state->inputs_available & (VARYING_BIT_TEX0 << unit))) {
texcoord = get_current_attrib(p, VERT_ATTRIB_TEX0 + unit);
} else if (p->texcoord_tex[unit]) {
texcoord = new(p->mem_ctx) ir_dereference_variable(p->texcoord_tex[unit]);
} else {
ir_variable *tc_array = p->shader->symbols->get_variable("gl_TexCoord");
assert(tc_array);
@ -1088,10 +1079,8 @@ create_new_program(struct gl_context *ctx, struct state_key *key)
_mesa_glsl_initialize_types(state);
_mesa_glsl_initialize_variables(p.instructions, state);
for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
p.src_texture[unit] = NULL;
p.texcoord_tex[unit] = NULL;
}
p.src_previous = NULL;