summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2001-02-16 18:56:46 +0000
committerKeith Whitwell <[email protected]>2001-02-16 18:56:46 +0000
commit4539e9195d2711fb977fbb6589427e0456102214 (patch)
tree6adcf12e815c7048df000486b222869e6b886ad4 /src
parent46b0988c673b28e072fd0cbf477632a9ab6f9f18 (diff)
Fix state bitmasks for invalidating line,tri,point functions. (won't fix
the fog problem, I don't think)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/swrast/s_context.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index b78b9e34ff4..4f4ea3ee950 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -1,4 +1,4 @@
-/* $Id: s_context.c,v 1.13 2001/02/16 18:14:41 keithw Exp $ */
+/* $Id: s_context.c,v 1.14 2001/02/16 18:56:46 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -152,19 +152,27 @@ _swrast_update_hint( GLcontext *ctx )
swrast->AllowPixelFog));
}
-#define _SWRAST_NEW_TRIANGLE (_NEW_RENDERMODE| \
+#define _SWRAST_NEW_DERIVED (_SWRAST_NEW_RASTERMASK | \
+ _NEW_TEXTURE | \
+ _NEW_HINT | \
+ _NEW_POLYGON )
+
+/* State referenced by _swrast_choose_triangle, _swrast_choose_line.
+ */
+#define _SWRAST_NEW_TRIANGLE (_SWRAST_NEW_DERIVED | \
+ _NEW_RENDERMODE| \
_NEW_POLYGON| \
_NEW_DEPTH| \
_NEW_STENCIL| \
_NEW_COLOR| \
_NEW_TEXTURE| \
- _NEW_HINT| \
_SWRAST_NEW_RASTERMASK| \
_NEW_LIGHT| \
_NEW_FOG | \
_DD_NEW_SEPERATE_SPECULAR)
-#define _SWRAST_NEW_LINE (_NEW_RENDERMODE| \
+#define _SWRAST_NEW_LINE (_SWRAST_NEW_DERIVED | \
+ _NEW_RENDERMODE| \
_NEW_LINE| \
_NEW_TEXTURE| \
_NEW_LIGHT| \
@@ -172,7 +180,8 @@ _swrast_update_hint( GLcontext *ctx )
_NEW_DEPTH | \
_DD_NEW_SEPERATE_SPECULAR)
-#define _SWRAST_NEW_POINT (_NEW_RENDERMODE | \
+#define _SWRAST_NEW_POINT (_SWRAST_NEW_DERIVED | \
+ _NEW_RENDERMODE | \
_NEW_POINT | \
_NEW_TEXTURE | \
_NEW_LIGHT | \