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/swrast/s_drawpix.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/swrast/s_drawpix.c')
| -rw-r--r-- | src/mesa/swrast/s_drawpix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index ab2dec8e19..0bee50400f 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -1,4 +1,4 @@ -/* $Id: s_drawpix.c,v 1.34 2002/06/15 02:38:17 brianp Exp $ */ +/* $Id: s_drawpix.c,v 1.35 2002/06/15 03:03:11 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -116,7 +116,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y, _mesa_span_default_fog(ctx, span); if ((SWRAST_CONTEXT(ctx)->_RasterMask & ~CLIP_BIT) == 0 - && ctx->Texture._ReallyEnabled == 0 + && ctx->Texture._EnabledUnits == 0 && unpack->Alignment == 1 && !unpack->SwapBytes && !unpack->LsbFirst) { @@ -817,7 +817,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y, (ctx->Pixel.HistogramEnabled && ctx->Histogram.Sink)) continue; - if (ctx->Pixel.PixelTextureEnabled && ctx->Texture._ReallyEnabled) { + if (ctx->Pixel.PixelTextureEnabled && ctx->Texture._EnabledUnits) { span->end = width; _swrast_pixel_texture(ctx, span); } |