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

EnvMode GL_BLEND and tex invalidate changes from Daryll

This commit is contained in:
Brian Paul 2000-05-04 16:15:33 +00:00
parent a14d28c2bd
commit 9f0289dfac
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/drivers/glide/fxdd.c
View File

@ -966,8 +966,14 @@ static GLboolean fxIsInHardware(GLcontext *ctx)
}
if (ctx->Texture.ReallyEnabled & TEXTURE0_2D) {
if (ctx->Texture.Unit[0].EnvMode == GL_BLEND)
if (ctx->Texture.Unit[0].EnvMode == GL_BLEND &&
(ctx->Texture.ReallyEnabled & TEXTURE1_2D ||
ctx->Texture.Unit[0].EnvColor[0] != 0 ||
ctx->Texture.Unit[0].EnvColor[1] != 0 ||
ctx->Texture.Unit[0].EnvColor[2] != 0 ||
ctx->Texture.Unit[0].EnvColor[3] != 1)) {
return GL_FALSE;
}
if (ctx->Texture.Unit[0].Current->Image[0]->Border > 0)
return GL_FALSE;
}

4
src/mesa/drivers/glide/fxddtex.c
View File

@ -95,9 +95,9 @@ static void fxTexInvalidate(GLcontext *ctx, struct gl_texture_object *tObj)
fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
tfxTexInfo *ti;
fxTMMoveOutTM(fxMesa,tObj); /* TO DO: SLOW but easy to write */
ti=fxTMGetTexInfo(tObj);
if (ti->isInTM) fxTMMoveOutTM(fxMesa,tObj); /* TO DO: SLOW but easy to write */
ti->validated=GL_FALSE;
fxMesa->new_state|=FX_NEW_TEXTURING;
ctx->Driver.RenderStart = fxSetupFXUnits;