summaryrefslogtreecommitdiff
path: root/src/mesa/swrast
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-08-29 22:32:31 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-08-29 22:32:31 +0000
commit8334c8a2169055cd87e55d32403d59b8e46deb59 (patch)
treeeffeab6a59b0797ba1630bf4996ce401541d4f8f /src/mesa/swrast
parentf7c4dc007f5ae964bc4357e9abefcf64131b84c9 (diff)
Move call to _swrast_update_rasterflags() since it depends on the
results of _swrast_update_fog_state(). Fixes bug where first frame of progs/samples/fog.c does not show fog.
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r--src/mesa/swrast/s_context.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 57b5364c8c..a265d9e6ce 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -513,9 +513,6 @@ _swrast_validate_derived( GLcontext *ctx )
SWcontext *swrast = SWRAST_CONTEXT(ctx);
if (swrast->NewState) {
- if (swrast->NewState & _SWRAST_NEW_RASTERMASK)
- _swrast_update_rasterflags( ctx );
-
if (swrast->NewState & _NEW_POLYGON)
_swrast_update_polygon( ctx );
@@ -537,6 +534,9 @@ _swrast_validate_derived( GLcontext *ctx )
if (swrast->NewState & (_NEW_TEXTURE | _NEW_PROGRAM))
_swrast_validate_texture_images( ctx );
+ if (swrast->NewState & _SWRAST_NEW_RASTERMASK)
+ _swrast_update_rasterflags( ctx );
+
swrast->NewState = 0;
swrast->StateChanges = 0;
swrast->InvalidateState = _swrast_invalidate_state;