diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-06-15 03:03:06 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-06-15 03:03:06 +0000 |
| commit | 8afe7de8deaf3c9613fd68b344de8c52b02b1879 (patch) | |
| tree | f600a192c9d0136faea8864a53eabc819eeb791f /src/mesa/tnl/t_vb_render.c | |
| parent | 8bdd0dc8d0e9c9cb2c71fbdd4c77e982cfc0b350 (diff) | |
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.
Diffstat (limited to 'src/mesa/tnl/t_vb_render.c')
| -rw-r--r-- | src/mesa/tnl/t_vb_render.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_vb_render.c b/src/mesa/tnl/t_vb_render.c index 496c22cc42..361a2fa442 100644 --- a/src/mesa/tnl/t_vb_render.c +++ b/src/mesa/tnl/t_vb_render.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_render.c,v 1.29 2002/04/09 16:56:52 keithw Exp $ */ +/* $Id: t_vb_render.c,v 1.30 2002/06/15 03:03:12 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -365,7 +365,7 @@ static void check_render( GLcontext *ctx, struct gl_pipeline_stage *stage ) if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) inputs |= VERT_BIT_COLOR1; - if (ctx->Texture._ReallyEnabled) { + if (ctx->Texture._EnabledUnits) { for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) { if (ctx->Texture.Unit[i]._ReallyEnabled) inputs |= VERT_BIT_TEX(i); |