From 9b75663866aed952fc6532599880903a7a290132 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 23 Sep 2014 16:15:22 -0700 Subject: [PATCH] i965: Restructure debug flags MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This cleans up the debug flags to be consistently indented, use bit shifting instead of hex-values and fixes a bug where the new DEBUG_NO8 flag used the same value as the DEBUG_VUE flag. This was hidden by the numbers not being aligned. Also removes gaps in the range where DEBUG_IOCTL (0x4) and DEBUG_REGION (0x400) used to be. Signed-off-by: Kristian Høgsberg Reviewed-by: Chris Forbes --- src/mesa/drivers/dri/i965/intel_debug.c | 60 ++++++++++++------------- src/mesa/drivers/dri/i965/intel_debug.h | 60 ++++++++++++------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_debug.c b/src/mesa/drivers/dri/i965/intel_debug.c index 1fb8b6cd1e2..a283357bcf1 100644 --- a/src/mesa/drivers/dri/i965/intel_debug.c +++ b/src/mesa/drivers/dri/i965/intel_debug.c @@ -36,37 +36,37 @@ uint64_t INTEL_DEBUG = 0; static const struct dri_debug_control debug_control[] = { - { "tex", DEBUG_TEXTURE}, - { "state", DEBUG_STATE}, - { "blit", DEBUG_BLIT}, - { "mip", DEBUG_MIPTREE}, - { "fall", DEBUG_PERF}, - { "perf", DEBUG_PERF}, - { "perfmon", DEBUG_PERFMON}, - { "bat", DEBUG_BATCH}, - { "pix", DEBUG_PIXEL}, - { "buf", DEBUG_BUFMGR}, - { "fbo", DEBUG_FBO}, - { "fs", DEBUG_WM }, - { "gs", DEBUG_GS}, - { "sync", DEBUG_SYNC}, - { "prim", DEBUG_PRIMS }, - { "vert", DEBUG_VERTS }, - { "dri", DEBUG_DRI }, - { "sf", DEBUG_SF }, - { "stats", DEBUG_STATS }, - { "wm", DEBUG_WM }, - { "urb", DEBUG_URB }, - { "vs", DEBUG_VS }, - { "clip", DEBUG_CLIP }, - { "aub", DEBUG_AUB }, + { "tex", DEBUG_TEXTURE}, + { "state", DEBUG_STATE}, + { "blit", DEBUG_BLIT}, + { "mip", DEBUG_MIPTREE}, + { "fall", DEBUG_PERF}, + { "perf", DEBUG_PERF}, + { "perfmon", DEBUG_PERFMON}, + { "bat", DEBUG_BATCH}, + { "pix", DEBUG_PIXEL}, + { "buf", DEBUG_BUFMGR}, + { "fbo", DEBUG_FBO}, + { "fs", DEBUG_WM }, + { "gs", DEBUG_GS}, + { "sync", DEBUG_SYNC}, + { "prim", DEBUG_PRIMS }, + { "vert", DEBUG_VERTS }, + { "dri", DEBUG_DRI }, + { "sf", DEBUG_SF }, + { "stats", DEBUG_STATS }, + { "wm", DEBUG_WM }, + { "urb", DEBUG_URB }, + { "vs", DEBUG_VS }, + { "clip", DEBUG_CLIP }, + { "aub", DEBUG_AUB }, { "shader_time", DEBUG_SHADER_TIME }, - { "no16", DEBUG_NO16 }, - { "blorp", DEBUG_BLORP }, - { "nodualobj", DEBUG_NO_DUAL_OBJECT_GS }, - { "optimizer", DEBUG_OPTIMIZER }, - { "noann", DEBUG_NO_ANNOTATION }, - { "no8", DEBUG_NO8 }, + { "no16", DEBUG_NO16 }, + { "blorp", DEBUG_BLORP }, + { "nodualobj", DEBUG_NO_DUAL_OBJECT_GS }, + { "optimizer", DEBUG_OPTIMIZER }, + { "noann", DEBUG_NO_ANNOTATION }, + { "no8", DEBUG_NO8 }, { NULL, 0 } }; diff --git a/src/mesa/drivers/dri/i965/intel_debug.h b/src/mesa/drivers/dri/i965/intel_debug.h index 8e1c2991f07..e859be1084c 100644 --- a/src/mesa/drivers/dri/i965/intel_debug.h +++ b/src/mesa/drivers/dri/i965/intel_debug.h @@ -33,36 +33,36 @@ extern uint64_t INTEL_DEBUG; -#define DEBUG_TEXTURE 0x1 -#define DEBUG_STATE 0x2 -#define DEBUG_BLIT 0x8 -#define DEBUG_MIPTREE 0x10 -#define DEBUG_PERF 0x20 -#define DEBUG_PERFMON 0x40 -#define DEBUG_BATCH 0x80 -#define DEBUG_PIXEL 0x100 -#define DEBUG_BUFMGR 0x200 -#define DEBUG_FBO 0x800 -#define DEBUG_GS 0x1000 -#define DEBUG_SYNC 0x2000 -#define DEBUG_PRIMS 0x4000 -#define DEBUG_VERTS 0x8000 -#define DEBUG_DRI 0x10000 -#define DEBUG_SF 0x20000 -#define DEBUG_STATS 0x100000 -#define DEBUG_WM 0x400000 -#define DEBUG_URB 0x800000 -#define DEBUG_VS 0x1000000 -#define DEBUG_CLIP 0x2000000 -#define DEBUG_AUB 0x4000000 -#define DEBUG_SHADER_TIME 0x8000000 -#define DEBUG_BLORP 0x10000000 -#define DEBUG_NO16 0x20000000 -#define DEBUG_VUE 0x40000000 -#define DEBUG_NO_DUAL_OBJECT_GS 0x80000000 -#define DEBUG_OPTIMIZER 0x100000000 -#define DEBUG_NO_ANNOTATION 0x200000000 -#define DEBUG_NO8 0x40000000 +#define DEBUG_TEXTURE (1 << 0) +#define DEBUG_STATE (1 << 1) +#define DEBUG_BLIT (1 << 2) +#define DEBUG_MIPTREE (1 << 3) +#define DEBUG_PERF (1 << 4) +#define DEBUG_PERFMON (1 << 5) +#define DEBUG_BATCH (1 << 6) +#define DEBUG_PIXEL (1 << 7) +#define DEBUG_BUFMGR (1 << 8) +#define DEBUG_FBO (1 << 9) +#define DEBUG_GS (1 << 10) +#define DEBUG_SYNC (1 << 11) +#define DEBUG_PRIMS (1 << 12) +#define DEBUG_VERTS (1 << 13) +#define DEBUG_DRI (1 << 14) +#define DEBUG_SF (1 << 15) +#define DEBUG_STATS (1 << 16) +#define DEBUG_WM (1 << 17) +#define DEBUG_URB (1 << 18) +#define DEBUG_VS (1 << 19) +#define DEBUG_CLIP (1 << 20) +#define DEBUG_AUB (1 << 21) +#define DEBUG_SHADER_TIME (1 << 22) +#define DEBUG_BLORP (1 << 23) +#define DEBUG_NO16 (1 << 24) +#define DEBUG_VUE (1 << 25) +#define DEBUG_NO_DUAL_OBJECT_GS (1 << 26) +#define DEBUG_OPTIMIZER (1 << 27) +#define DEBUG_NO_ANNOTATION (1 << 28) +#define DEBUG_NO8 (1 << 29) #ifdef HAVE_ANDROID_PLATFORM #define LOG_TAG "INTEL-MESA" -- 2.30.2