X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgallium%2Fdrivers%2Fr300%2Fr300_screen.h;h=b28de008304a70b5c2f026b876901e27394f2093;hb=b743c9bf2d5c987c97a22e725a56a2b641b58ae4;hp=70ea2fe8d921e12c20c08a99637f1b81251f547c;hpb=a8ea1dacc63ac567498049e5756c247b9fec6cd9;p=mesa.git

diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index 70ea2fe8d92..b28de008304 100644
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -24,31 +24,47 @@
 #ifndef R300_SCREEN_H
 #define R300_SCREEN_H
 
-#include "pipe/p_screen.h"
-
 #include "r300_chipset.h"
-
+#include "radeon/radeon_winsys.h"
+#include "pipe/p_screen.h"
+#include "util/disk_cache.h"
+#include "util/slab.h"
+#include "os/os_thread.h"
 #include <stdio.h>
 
 struct r300_screen {
     /* Parent class */
     struct pipe_screen screen;
 
-    struct r300_winsys_screen *rws;
+    struct radeon_winsys *rws;
 
-    /* Chipset capabilities */
+    /* Chipset info and capabilities. */
+    struct radeon_info info;
     struct r300_capabilities caps;
 
     /** Combination of DBG_xxx flags */
     unsigned debug;
+
+    struct disk_cache *disk_shader_cache;
+
+    struct slab_parent_pool pool_transfers;
+
+    /* The MSAA texture with CMASK access; */
+    struct pipe_resource *cmask_resource;
+    mtx_t cmask_mutex;
 };
 
 
-/* Convenience cast wrapper. */
-static INLINE struct r300_screen* r300_screen(struct pipe_screen* screen) {
+/* Convenience cast wrappers. */
+static inline struct r300_screen* r300_screen(struct pipe_screen* screen) {
     return (struct r300_screen*)screen;
 }
 
+static inline struct radeon_winsys *
+radeon_winsys(struct pipe_screen *screen) {
+    return r300_screen(screen)->rws;
+}
+
 /* Debug functionality. */
 
 /**
@@ -61,25 +77,42 @@ static INLINE struct r300_screen* r300_screen(struct pipe_screen* screen) {
  * those changes.
  */
 /*@{*/
-#define DBG_HELP    0x0000001
-#define DBG_FP      0x0000002
-#define DBG_VP      0x0000004
-#define DBG_CS      0x0000008
-#define DBG_DRAW    0x0000010
-#define DBG_TEX     0x0000020
-#define DBG_FALL    0x0000040
-#define DBG_ANISOHQ 0x0000080
-#define DBG_NO_TILING 0x0000100
-#define DBG_NO_IMMD 0x0000200
-#define DBG_STATS   0x0000400
+
+/* Logging. */
+#define DBG_PSC         (1 << 0)
+#define DBG_FP          (1 << 1)
+#define DBG_VP          (1 << 2)
+#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_FB          (1 << 8)
+#define DBG_RS_BLOCK    (1 << 9)
+#define DBG_CBZB        (1 << 10)
+#define DBG_HYPERZ      (1 << 11)
+#define DBG_SCISSOR     (1 << 12)
+#define DBG_INFO        (1 << 13)
+#define DBG_MSAA        (1 << 14)
+/* Features. */
+#define DBG_ANISOHQ     (1 << 16)
+#define DBG_NO_TILING   (1 << 17)
+#define DBG_NO_IMMD     (1 << 18)
+#define DBG_NO_OPT      (1 << 19)
+#define DBG_NO_CBZB     (1 << 20)
+#define DBG_NO_ZMASK    (1 << 21)
+#define DBG_NO_HIZ      (1 << 22)
+#define DBG_NO_CMASK    (1 << 23)
+/* Statistics. */
+#define DBG_P_STAT      (1 << 25)
 /*@}*/
 
-static INLINE boolean SCREEN_DBG_ON(struct r300_screen * screen, unsigned flags)
+static inline boolean SCREEN_DBG_ON(struct r300_screen * screen, unsigned flags)
 {
     return (screen->debug & flags) ? TRUE : FALSE;
 }
 
-static INLINE void SCREEN_DBG(struct r300_screen * screen, unsigned flags,
+static inline void SCREEN_DBG(struct r300_screen * screen, unsigned flags,
                               const char * fmt, ...)
 {
     if (SCREEN_DBG_ON(screen, flags)) {