-#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
+
+/* 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_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)