From c703658b3965bf2e4f3593a0d54be03e8e8b1436 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 23 Apr 2014 15:30:27 -0700 Subject: mesa: Drop _EnabledUnits. The field wasn't really valid, since we've got more than 32 units now. It turns out it was mostly just used for checking != 0, or checking for fixed function coordinates, though. v2: Fix mis-conversion in xm_line.c (caught by Ken). Reviewed-by: Matt Turner (v1) Reviewed-by: Kenneth Graunke --- src/mesa/drivers/osmesa/osmesa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/osmesa') diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 347913dd678..6026fd51e03 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -207,7 +207,7 @@ osmesa_choose_line_function( struct gl_context *ctx ) if (ctx->RenderMode != GL_RENDER || ctx->Line.SmoothFlag || - ctx->Texture._EnabledUnits || + ctx->Texture.MaxEnabledTexImageUnit == -1 || ctx->Light.ShadeModel != GL_FLAT || ctx->Line.Width != 1.0F || ctx->Line.StippleFlag || @@ -322,7 +322,7 @@ osmesa_choose_triangle_function( struct gl_context *ctx ) if (ctx->RenderMode != GL_RENDER || ctx->Polygon.SmoothFlag || ctx->Polygon.StippleFlag || - ctx->Texture._EnabledUnits) { + ctx->Texture._MaxEnabledTexImageUnit != -1) { return NULL; } -- cgit v1.2.3