summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-11-25 20:26:59 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-11-25 20:26:59 +0000
commit3ac375b1749102f434e34197f1a67212c33797b9 (patch)
tree806329480c1fe78023426e3cdce3c79b8800bd9f /src
parente44bf40402f27171305df8506e6d53c7ba9c596b (diff)
set default texcoords for glBitmap/glDrawPixels
Diffstat (limited to 'src')
-rw-r--r--src/mesa/swrast/s_bitmap.c8
-rw-r--r--src/mesa/swrast/s_drawpix.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c
index abe5825d9d..9194fc7c34 100644
--- a/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@ -1,8 +1,8 @@
-/* $Id: s_bitmap.c,v 1.19 2002/08/07 00:45:07 brianp Exp $ */
+/* $Id: s_bitmap.c,v 1.20 2002/11/25 20:26:59 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.0
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
@@ -83,6 +83,8 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
_mesa_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
_mesa_span_default_fog(ctx, &span);
+ if (ctx->Texture._EnabledUnits)
+ _mesa_span_default_texcoords(ctx, &span);
for (row = 0; row < height; row++, span.y++) {
const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
@@ -197,6 +199,8 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
_mesa_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
_mesa_span_default_fog(ctx, &span);
+ if (ctx->Texture._EnabledUnits)
+ _mesa_span_default_texcoords(ctx, &span);
for (row=0; row<height; row++, span.y++) {
const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index a9cddf1fec..033a022905 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -1,8 +1,8 @@
-/* $Id: s_drawpix.c,v 1.39 2002/10/30 20:18:38 brianp Exp $ */
+/* $Id: s_drawpix.c,v 1.40 2002/11/25 20:26:59 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.0
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
@@ -114,6 +114,8 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
_mesa_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
_mesa_span_default_fog(ctx, &span);
+ if (ctx->Texture._EnabledUnits)
+ _mesa_span_default_texcoords(ctx, &span);
if ((SWRAST_CONTEXT(ctx)->_RasterMask & ~CLIP_BIT) == 0
&& ctx->Texture._EnabledUnits == 0