Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / gallium / drivers / r300 / r300_screen.h

diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index 29492024fe3ab92c46411eec07031cb73eb1bea1..8b7f1fab61bb170021fdd6d49f80f00e82af2845 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -28,8 +28,12 @@
 
 #include "r300_chipset.h"
 
+#include "util/u_mempool.h"
+
 #include <stdio.h>
 
+struct r300_winsys_screen;
+
 struct r300_screen {
     /* Parent class */
     struct pipe_screen screen;
@@ -39,16 +43,28 @@ struct r300_screen {
     /* Chipset capabilities */
     struct r300_capabilities caps;
 
+    /* Memory pools. */
+    struct util_mempool pool_buffers;
+
     /** Combination of DBG_xxx flags */
     unsigned debug;
+
+    /* The number of created contexts to know whether we have multiple
+     * contexts or not. */
+    int num_contexts;
 };
 
 
-/* Convenience cast wrapper. */
+/* Convenience cast wrappers. */
 static INLINE struct r300_screen* r300_screen(struct pipe_screen* screen) {
     return (struct r300_screen*)screen;
 }
 
+static INLINE struct r300_winsys_screen *
+r300_winsys_screen(struct pipe_screen *screen) {
+    return r300_screen(screen)->rws;
+}
+
 /* Debug functionality. */
 
 /**
@@ -61,23 +77,32 @@ static INLINE struct r300_screen* r300_screen(struct pipe_screen* screen) {
  * those changes.
  */
 /*@{*/
-#define DBG_HELP        (1 << 0)
+
 /* Logging. */
+#define DBG_PSC         (1 << 0)
 #define DBG_FP          (1 << 1)
 #define DBG_VP          (1 << 2)
-#define DBG_CS          (1 << 3)
+#define DBG_SWTCL       (1 << 3)
 #define DBG_DRAW        (1 << 4)
 #define DBG_TEX         (1 << 5)
 #define DBG_TEXALLOC    (1 << 6)
 #define DBG_RS          (1 << 7)
 #define DBG_FALL        (1 << 8)
 #define DBG_FB          (1 << 9)
+#define DBG_RS_BLOCK    (1 << 10)
+#define DBG_CBZB        (1 << 11)
+#define DBG_HYPERZ      (1 << 12)
+#define DBG_SCISSOR     (1 << 13)
 /* Features. */
 #define DBG_ANISOHQ     (1 << 16)
 #define DBG_NO_TILING   (1 << 17)
 #define DBG_NO_IMMD     (1 << 18)
+#define DBG_FAKE_OCC    (1 << 19)
+#define DBG_NO_OPT      (1 << 20)
+#define DBG_NO_CBZB     (1 << 21)
 /* Statistics. */
 #define DBG_STATS       (1 << 24)
+#define DBG_P_STAT      (1 << 25)
 /*@}*/
 
 static INLINE boolean SCREEN_DBG_ON(struct r300_screen * screen, unsigned flags)