[Mesa-dev] [PATCH] Remove the ATI_envmap_bumpmap extension

[Chris Forbes]

On Sat, Jun 28, 2014 at 10:19 AM, Jason Ekstrand <jason at jlekstrand.net> wrote:

> @@ -653,135 +613,6 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span )
[snip]

> -
> -   /*
> -    * Must do all texture sampling before combining in order to
> -    * accomodate GL_ARB_texture_env_crossbar.
> -    */
> -   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
> -      const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
> -      if (texUnit->_Current &&
> -          texUnit->_CurrentCombine->ModeRGB != GL_BUMP_ENVMAP_ATI) {

You're ripping out the non-bump case here too...

> -         const GLfloat (*texcoords)[4] = (const GLfloat (*)[4])
> -            span->array->attribs[VARYING_SLOT_TEX0 + unit];
> -         const struct gl_texture_object *curObj = texUnit->_Current;