#ifndef R300_SCREEN_H
#define R300_SCREEN_H
-#include "pipe/p_screen.h"
-
#include "r300_chipset.h"
-
+#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "pipe/p_screen.h"
#include "util/u_slab.h"
-
#include <stdio.h>
-struct radeon_winsys;
-
struct r300_screen {
/* Parent class */
struct pipe_screen screen;
struct radeon_winsys *rws;
- /* Chipset capabilities */
+ /* Chipset info and capabilities. */
+ struct radeon_info info;
struct r300_capabilities caps;
/* Memory pools. */
#define DBG_TEX (1 << 5)
#define DBG_TEXALLOC (1 << 6)
#define DBG_RS (1 << 7)
-/* gap - fill it */
-#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)
-#define DBG_UPLOAD (1 << 14)
-#define DBG_INFO (1 << 15)
+#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)
/* Features. */
#define DBG_ANISOHQ (1 << 16)
#define DBG_NO_TILING (1 << 17)
#define DBG_NO_IMMD (1 << 18)
-/* gap - fill it */
-#define DBG_NO_OPT (1 << 20)
-#define DBG_NO_CBZB (1 << 21)
-#define DBG_NO_ZMASK (1 << 22)
-#define DBG_NO_HIZ (1 << 23)
+#define DBG_NO_OPT (1 << 19)
+#define DBG_NO_CBZB (1 << 20)
+#define DBG_NO_ZMASK (1 << 21)
+#define DBG_NO_HIZ (1 << 22)
/* Statistics. */
#define DBG_P_STAT (1 << 25)
/*@}*/