summaryrefslogtreecommitdiff
path: root/src/mesa/swrast
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-05-01 22:44:02 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-05-01 22:44:02 +0000
commit92f9785c727ea10ff5f8dc9770f0e8f388fcea70 (patch)
tree10335899a8205128723f6b459d827e918bbc2d86 /src/mesa/swrast
parent09b00c5ded8e6211c9c79be600bb8c8ecad0d8fc (diff)
Use ctx->Const.MaxTextureImageUnits and MaxTextureCoordUnits in more places.
Misc vertex array / vertex program changes.
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r--src/mesa/swrast/s_context.c4
-rw-r--r--src/mesa/swrast/s_context.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 79ee5b440f..5160e810cd 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -101,6 +101,10 @@ _swrast_update_rasterflags( GLcontext *ctx )
RasterMask |= MULTI_DRAW_BIT; /* all color index bits disabled */
}
+ if (ctx->FragmentProgram.Enabled) {
+ RasterMask |= FRAGPROG_BIT;
+ }
+
SWRAST_CONTEXT(ctx)->_RasterMask = RasterMask;
}
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index 219e002990..947d48e3af 100644
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -1,5 +1,3 @@
-/* $Id: s_context.h,v 1.26 2003/03/16 22:02:36 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
* Version: 5.1
@@ -242,6 +240,7 @@ typedef void (*swrast_tri_func)( GLcontext *ctx, const SWvertex *,
/**< buffer or no buffers. */
#define OCCLUSION_BIT 0x800 /**< GL_HP_occlusion_test enabled */
#define TEXTURE_BIT 0x1000 /**< Texturing really enabled */
+#define FRAGPROG_BIT 0x2000 /**< Fragment program enabled */
/*@}*/
#define _SWRAST_NEW_RASTERMASK (_NEW_BUFFERS| \
@@ -249,6 +248,7 @@ typedef void (*swrast_tri_func)( GLcontext *ctx, const SWvertex *,
_NEW_COLOR| \
_NEW_DEPTH| \
_NEW_FOG| \
+ _NEW_PROGRAM| \
_NEW_STENCIL| \
_NEW_TEXTURE| \
_NEW_VIEWPORT| \