From 7e9799ac3d7f3b1b90f098420d413be95916c541 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Fri, 22 Sep 2006 11:45:21 +0000 Subject: Use _Enabled rather than _Active when checking for fragment shaders --- src/mesa/swrast/s_triangle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/swrast/s_triangle.c') diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 440345fb12..5a1fc8aec1 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1073,7 +1073,7 @@ _swrast_choose_triangle( GLcontext *ctx ) } } - if (ctx->Texture._EnabledCoordUnits || ctx->FragmentProgram._Active || + if (ctx->Texture._EnabledCoordUnits || ctx->FragmentProgram._Enabled || ctx->ATIFragmentShader._Enabled || ctx->ShaderObjects._FragmentShaderPresent) { /* Ugh, we do a _lot_ of tests to pick the best textured tri func */ const struct gl_texture_object *texObj2D; @@ -1089,7 +1089,7 @@ _swrast_choose_triangle( GLcontext *ctx ) /* First see if we can use an optimized 2-D texture function */ if (ctx->Texture._EnabledCoordUnits == 0x1 - && !ctx->FragmentProgram._Active + && !ctx->FragmentProgram._Enabled && !ctx->ATIFragmentShader._Enabled && !ctx->ShaderObjects._FragmentShaderPresent && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT -- cgit v1.2.3