fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa/main: remove leftover bumpmap code

Browse source 
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>
(cherry picked from commit 92ff89f6f5)
This commit is contained in:
Erik Faye-Lund 2020-08-26 18:40:02 +02:00 • committed by Dylan Baker
parent b28e674f3f
commit 431541e791
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -31,7 +31,7 @@
"description": "mesa/main: remove leftover bumpmap code",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "4000c0112a49c28793844f454278b50e00943173"
},

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.
*/
@ -735,8 +728,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);
@ -1089,10 +1080,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;