diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index 420163b3e99..621f5ac2fae 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -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;