From 8afe7de8deaf3c9613fd68b344de8c52b02b1879 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 15 Jun 2002 03:03:06 +0000 Subject: Implemented GL_NV_texture_rectangle extension. Replace struct gl_texure_object's Dimension w/ Target field. Added _EnabledUnits to struct gl_texture_attrib - the _ReallyEnabled field is obsolete, but still present for now. This effectively removes the 8-texture units limit, 32 units now possible, but unlikely! New TEXTURE_1D/2D/3D/CUBE/RECT_BIT tokens for unit->_ReallyEnabled field. Updated device drivers to use ctx->Texture._EnabledUnits. --- src/mesa/swrast_setup/ss_vb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mesa/swrast_setup') diff --git a/src/mesa/swrast_setup/ss_vb.c b/src/mesa/swrast_setup/ss_vb.c index b47508b6f6..fce1d489a0 100644 --- a/src/mesa/swrast_setup/ss_vb.c +++ b/src/mesa/swrast_setup/ss_vb.c @@ -1,4 +1,4 @@ -/* $Id: ss_vb.c,v 1.18 2002/06/15 02:38:17 brianp Exp $ */ +/* $Id: ss_vb.c,v 1.19 2002/06/15 03:03:12 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -388,10 +388,10 @@ _swsetup_choose_rastersetup_func(GLcontext *ctx) if (ctx->Visual.rgbMode) { funcindex = COLOR; - if (ctx->Texture._ReallyEnabled & ~TEXTURE0_ANY) - funcindex |= MULTITEX; - else if (ctx->Texture._ReallyEnabled & TEXTURE0_ANY) - funcindex |= TEX0; + if (ctx->Texture._EnabledUnits > 1) + funcindex |= MULTITEX; /* a unit above unit[0] is enabled */ + else if (ctx->Texture._EnabledUnits == 1) + funcindex |= TEX0; /* only unit 0 is enabled */ if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) funcindex |= SPEC; -- cgit v1.2.3