From 7b0b2ec73ac27d571fbaddeb4b23b8cabde7f963 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 30 Mar 2001 15:16:12 +0000 Subject: [PATCH] fixed compilation problems related to ctx->_Enabled removal --- src/mesa/drivers/glide/fxdd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c index c129978f769..d18c34a32af 100644 --- a/src/mesa/drivers/glide/fxdd.c +++ b/src/mesa/drivers/glide/fxdd.c @@ -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; } -- 2.30.2