r200: fix some cube map issues

[mesa.git] / src / mesa / drivers / dri / ffb / ffb_state.c

diff --git a/src/mesa/drivers/dri/ffb/ffb_state.c b/src/mesa/drivers/dri/ffb/ffb_state.c
index b81d94de2529174166f199acbb44ff97e1ac0921..5eb8f417ffb76015bcb38c497bd48d54e50a3d21 100644 (file)
--- a/src/mesa/drivers/dri/ffb/ffb_state.c
+++ b/src/mesa/drivers/dri/ffb/ffb_state.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_state.c,v 1.5 2002/10/30 12:51:27 alanh Exp $
+/* 
  *
  * GLX Hardware Device Driver for Sun Creator/Creator3D
  * Copyright (C) 2000, 2001 David S. Miller
@@ -25,9 +25,18 @@
  *    David S. Miller <davem@redhat.com>
  */
 
-#include "mtypes.h"
-#include "colormac.h"
-#include "mm.h"
+#include "main/mtypes.h"
+#include "main/colormac.h"
+#include "main/mm.h"
+#include "main/extensions.h"
+#include "main/enums.h"
+
+#include "vbo/vbo.h"
+#include "tnl/tnl.h"
+#include "tnl/t_pipeline.h"
+#include "swrast/swrast.h"
+#include "swrast_setup/swrast_setup.h"
+
 #include "ffb_dd.h"
 #include "ffb_span.h"
 #include "ffb_depth.h"
@@ -36,15 +45,6 @@
 #include "ffb_tris.h"
 #include "ffb_state.h"
 #include "ffb_lock.h"
-#include "extensions.h"
-#include "enums.h"
-
-#include "swrast/swrast.h"
-#include "array_cache/acache.h"
-#include "tnl/tnl.h"
-#include "swrast_setup/swrast_setup.h"
-
-#include "tnl/t_pipeline.h"
 
 #undef STATE_TRACE
 
@@ -275,7 +275,7 @@ ffbDDStencilFuncSeparate(GLcontext *ctx, GLenum face, GLenum func,
        /* We will properly update sw/hw state when stenciling is
         * enabled.
         */
-       if (! ctx->Stencil.Enabled)
+       if (! ctx->Stencil._Enabled)
                return;
 
        stencilctl = fmesa->stencilctl;
@@ -333,7 +333,7 @@ ffbDDStencilOpSeparate(GLcontext *ctx, GLenum face, GLenum fail,
        /* We will properly update sw/hw state when stenciling is
         * enabled.
         */
-       if (! ctx->Stencil.Enabled)
+       if (! ctx->Stencil._Enabled)
                return;
 
        stencilctl = fmesa->stencilctl;
@@ -1034,7 +1034,7 @@ static void ffbDDUpdateState(GLcontext *ctx, GLuint newstate)
 
        _swrast_InvalidateState( ctx, newstate );
        _swsetup_InvalidateState( ctx, newstate );
-       _ac_InvalidateState( ctx, newstate );
+       _vbo_InvalidateState( ctx, newstate );
        _tnl_InvalidateState( ctx, newstate );
 
        if (newstate & _NEW_TEXTURE)