OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vc4: Make the miptree debug code available under VC4_DEBUG=surf

Browse Source 
I kept flipping the bool on for debug, so let's just make it available.

Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Eric Anholt
2017-06-28 17:39:34 -07:00
parent a2d87a0019
commit 111b6b77cb
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/vc4/vc4_resource.c
View File

@@ -34,8 +34,6 @@
#include "vc4_resource.h" #include "vc4_resource.h"
#include "vc4_tiling.h" #include "vc4_tiling.h"
static bool miptree_debug = false;
static bool static bool
vc4_resource_bo_alloc(struct vc4_resource *rsc) vc4_resource_bo_alloc(struct vc4_resource *rsc)
{ {
@@ -43,7 +41,7 @@ vc4_resource_bo_alloc(struct vc4_resource *rsc)
struct pipe_screen *pscreen = prsc->screen; struct pipe_screen *pscreen = prsc->screen;
struct vc4_bo *bo; struct vc4_bo *bo;
if (miptree_debug) { if (vc4_debug & VC4_DEBUG_SURFACE) {
fprintf(stderr, "alloc %p: size %d + offset %d -> %d\n", fprintf(stderr, "alloc %p: size %d + offset %d -> %d\n",
rsc, rsc,
rsc->slices[0].size, rsc->slices[0].size,
@@ -482,7 +480,7 @@ vc4_setup_slices(struct vc4_resource *rsc)
offset += slice->size; offset += slice->size;
if (miptree_debug) { if (vc4_debug & VC4_DEBUG_SURFACE) {
static const char tiling_chars[] = { static const char tiling_chars[] = {
[VC4_TILING_FORMAT_LINEAR] = 'R', [VC4_TILING_FORMAT_LINEAR] = 'R',
[VC4_TILING_FORMAT_LT] = 'L', [VC4_TILING_FORMAT_LT] = 'L',
@@ -680,7 +678,7 @@ vc4_resource_from_handle(struct pipe_screen *pscreen,
goto fail; goto fail;
} }
if (miptree_debug) { if (vc4_debug & VC4_DEBUG_SURFACE) {
fprintf(stderr, fprintf(stderr,
"rsc import %p (format %d), %dx%d: " "rsc import %p (format %d), %dx%d: "
"level 0 (R) -> stride %d@0x%08x\n", "level 0 (R) -> stride %d@0x%08x\n",

2
src/gallium/drivers/vc4/vc4_screen.c
View File

@@ -43,6 +43,8 @@
static const struct debug_named_value debug_options[] = { static const struct debug_named_value debug_options[] = {
{ "cl", VC4_DEBUG_CL, { "cl", VC4_DEBUG_CL,
"Dump command list during creation" }, "Dump command list during creation" },
{ "surf", VC4_DEBUG_SURFACE,
"Dump surface layouts" },
{ "qpu", VC4_DEBUG_QPU, { "qpu", VC4_DEBUG_QPU,
"Dump generated QPU instructions" }, "Dump generated QPU instructions" },
{ "qir", VC4_DEBUG_QIR, { "qir", VC4_DEBUG_QIR,

1
src/gallium/drivers/vc4/vc4_screen.h
View File

@@ -48,6 +48,7 @@ struct vc4_bo;
#define VC4_DEBUG_ALWAYS_SYNC 0x0100 #define VC4_DEBUG_ALWAYS_SYNC 0x0100
#define VC4_DEBUG_NIR 0x0200 #define VC4_DEBUG_NIR 0x0200
#define VC4_DEBUG_DUMP 0x0400 #define VC4_DEBUG_DUMP 0x0400
#define VC4_DEBUG_SURFACE 0x0800
#define VC4_MAX_MIP_LEVELS 12 #define VC4_MAX_MIP_LEVELS 12
#define VC4_MAX_TEXTURE_SAMPLERS 16 #define VC4_MAX_TEXTURE_SAMPLERS 16