diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-04-08 02:27:16 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-04-08 02:27:16 +0000 |
| commit | 36a0a3252e1e20df69b53f70ba93bc74c4a4bf0e (patch) | |
| tree | 6c680de320af7a288fe70e5a95696bcf0f5faa56 /src/mesa/swrast/s_drawpix.c | |
| parent | 0cebd5822a39ad3b3d7621f8e59efab329bfb5b9 (diff) | |
Added ctx->Texture._EnabledCoordUnits bitfield.
Fixed some vertex array / vertex program glitches with glDrawElements.
Fixed some fragment program runtime bugs.
Non-trivial Cg programs are running now.
Diffstat (limited to 'src/mesa/swrast/s_drawpix.c')
| -rw-r--r-- | src/mesa/swrast/s_drawpix.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index bc791b9078..008b60dcff 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -1,5 +1,3 @@ -/* $Id: s_drawpix.c,v 1.47 2003/03/25 02:23:45 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 5.1 @@ -111,11 +109,11 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y, _swrast_span_default_z(ctx, &span); if (ctx->Fog.Enabled) _swrast_span_default_fog(ctx, &span); - if (ctx->Texture._EnabledUnits) + if (ctx->Texture._EnabledCoordUnits) _swrast_span_default_texcoords(ctx, &span); if ((SWRAST_CONTEXT(ctx)->_RasterMask & ~CLIP_BIT) == 0 - && ctx->Texture._EnabledUnits == 0 + && ctx->Texture._EnabledCoordUnits == 0 && unpack->Alignment == 1 && !unpack->SwapBytes && !unpack->LsbFirst) { @@ -650,7 +648,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y, if (ctx->Fog.Enabled) _swrast_span_default_fog(ctx, &span); - if (ctx->Texture._EnabledUnits) + if (ctx->Texture._EnabledCoordUnits) _swrast_span_default_texcoords(ctx, &span); if (type == GL_UNSIGNED_SHORT && ctx->Visual.depthBits == 16 @@ -777,7 +775,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y, _swrast_span_default_z(ctx, &span); if (ctx->Fog.Enabled) _swrast_span_default_fog(ctx, &span); - if (ctx->Texture._EnabledUnits) + if (ctx->Texture._EnabledCoordUnits) _swrast_span_default_texcoords(ctx, &span); if (SWRAST_CONTEXT(ctx)->_RasterMask == 0 && !zoom && x >= 0 && y >= 0 |