X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmesa%2Fswrast_setup%2Fss_context.h;h=256d363967a4f6f4bf5b30c24bf05dae146ccec9;hb=c6ba85a8c0f02b3b7058dae7afb6c49f56567319;hp=ed4da78d62936e4d3de7f77dff22bed94c94bed9;hpb=53560311294814ae0daa8457307a2b25077bf4e9;p=mesa.git

diff --git a/src/mesa/swrast_setup/ss_context.h b/src/mesa/swrast_setup/ss_context.h
index ed4da78d629..256d363967a 100644
--- a/src/mesa/swrast_setup/ss_context.h
+++ b/src/mesa/swrast_setup/ss_context.h
@@ -1,10 +1,7 @@
-/* $Id: ss_context.h,v 1.9 2001/07/17 19:39:32 keithw Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,37 +16,28 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *    Keith Whitwell <keithw@valinux.com>
+ *    Keith Whitwell <keithw@vmware.com>
  */
 
 #ifndef SS_CONTEXT_H
 #define SS_CONTEXT_H
 
-#include "mtypes.h"
+#include "main/glheader.h"
 #include "swrast/swrast.h"
-#include "swrast_setup.h"
+#include "tnl/t_context.h"
 
 typedef struct {
    GLuint NewState;
-   SWvertex *verts;
    GLenum render_prim;
-   GLuint SetupIndex;
-
-   /* Temporaries for translating away float colors:
-    */
-   struct gl_client_array ChanColor;
-   struct gl_client_array ChanSecondaryColor;
-
-
-   struct {
-      void (*Start)( GLcontext * );
-      void (*Finish)( GLcontext * );
-   } Driver;
+   GLbitfield64 last_index_bitset;
+   SWvertex *verts;
+   GLboolean intColors;
 } SScontext;
 
 #define SWSETUP_CONTEXT(ctx) ((SScontext *)ctx->swsetup_context)