fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 06:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed compilation problems related to ctx->_Enabled removal

Browse source
This commit is contained in:
Brian Paul 2001-03-30 15:16:12 +00:00
parent 5e23af22f7
commit 7b0b2ec73a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/drivers/glide/fxdd.c
View file

@ -903,8 +903,8 @@ fxIsInHardware(GLcontext * ctx)
/* KW: This was wrong (I think) and I changed it... which doesn't mean
* it is now correct...
*/
if ((ctx->_Enabled & (TEXTURE0_1D | TEXTURE0_2D | TEXTURE0_3D)) &&
(ctx->_Enabled & (TEXTURE1_1D | TEXTURE1_2D | TEXTURE1_3D))) {
if ((ctx->Texture._ReallyEnabled & (TEXTURE0_1D | TEXTURE0_2D | TEXTURE0_3D)) &&
(ctx->Texture._ReallyEnabled & (TEXTURE1_1D | TEXTURE1_2D | TEXTURE1_3D))) {
/* Can't use multipass to blend a multitextured triangle - fall
* back to software.
*/
@ -922,9 +922,10 @@ fxIsInHardware(GLcontext * ctx)
}
}
else {
if ((ctx->_Enabled & (TEXTURE1_1D | TEXTURE1_2D | TEXTURE1_3D)) ||
if ((ctx->Texture._ReallyEnabled & (TEXTURE1_1D | TEXTURE1_2D | TEXTURE1_3D)) ||
/* Not very well written ... */
((ctx->_Enabled & TEXTURE0_1D) && (!(ctx->_Enabled & TEXTURE0_2D)))
((ctx->Texture._ReallyEnabled & TEXTURE0_1D) &&
(!(ctx->Texture._ReallyEnabled & TEXTURE0_2D)))
) {
return GL_FALSE;
}