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.

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 57b5364..a265d9e 100644 (file)
--- 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;