i965/nir: Do not scalarize phis in non-scalar setups

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_context.h

diff --git a/src/mesa/drivers/dri/radeon/radeon_context.h b/src/mesa/drivers/dri/radeon/radeon_context.h
index 572acbb0069b8a045cc12511a02aecf9b43b1caf..badabd9508c356f0fcccef2fea256c7c0b86df21 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_context.h
+++ b/src/mesa/drivers/dri/radeon/radeon_context.h
@@ -35,7 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /*
  * Authors:
  *   Gareth Hughes <gareth@valinux.com>
- *   Keith Whitwell <keith@tungstengraphics.com>
+ *   Keith Whitwell <keithw@vmware.com>
  *   Kevin E. Martin <martin@valinux.com>
  *   Nicolai Haehnle <prefect_@gmx.net>
  */
@@ -47,7 +47,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dri_util.h"
 #include "drm.h"
 #include "radeon_drm.h"
-#include "texmem.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/colormac.h"
@@ -60,8 +59,6 @@ struct r100_context;
 typedef struct r100_context r100ContextRec;
 typedef struct r100_context *r100ContextPtr;
 
-#include "radeon_lock.h"
-
 
 
 #define R100_TEX_ALL 0x7
@@ -299,6 +296,11 @@ struct radeon_texture_state {
 #define R100_QUERYOBJ_DATA_0 1
 #define R100_QUERYOBJ_CMDSIZE  2
 
+#define STP_CMD_0 0
+#define STP_DATA_0 1
+#define STP_CMD_1 2
+#define STP_STATE_SIZE 35
+
 struct r100_hw_state {
        /* Hardware state, stored as cmdbuf commands:  
         *   -- Need to doublebuffer for
@@ -323,11 +325,15 @@ struct r100_hw_state {
        struct radeon_state_atom fog;
        struct radeon_state_atom glt;
        struct radeon_state_atom txr[3];        /* for NPOT */
-
+       struct radeon_state_atom stp;
 };
 
+struct radeon_stipple_state {
+       GLuint mask[32];
+};
 
 struct r100_state {
+       struct radeon_stipple_state stipple;
        struct radeon_texture_state texture;
 };
 
@@ -410,7 +416,6 @@ struct r100_context {
        GLuint NeedTexMatrix;
        GLuint TexMatColSwap;
        GLmatrix tmpmat[RADEON_MAX_TEXTURE_UNITS];
-       GLuint last_ReallyEnabled;
 
        /* radeon_tcl.c
         */
@@ -421,7 +426,6 @@ struct r100_context {
        struct r100_swtcl_info swtcl;
 
        GLboolean using_hyperz;
-       GLboolean texmicrotile;
 
        /* Performance counters
         */
@@ -436,15 +440,25 @@ struct r100_context {
 };
 
 
-#define R100_CONTEXT(ctx)              ((r100ContextPtr)(ctx->DriverCtx))
+static inline r100ContextPtr
+R100_CONTEXT(struct gl_context *ctx)
+{
+   return (r100ContextPtr) ctx;
+}
+
 
 
 #define RADEON_OLD_PACKETS 1
 
-extern GLboolean r100CreateContext( const __GLcontextModes *glVisual,
-                                   __DRIcontextPrivate *driContextPriv,
+extern GLboolean r100CreateContext( gl_api api,
+                                   const struct gl_config *glVisual,
+                                   __DRIcontext *driContextPriv,
+                                   unsigned major_version,
+                                   unsigned minor_version,
+                                   uint32_t flags,
+                                    bool notify_reset,
+                                   unsigned *error,
                                    void *sharedContextPrivate);
-  
 
 
 #endif                         /* __RADEON_CONTEXT_H__ */