From: Eric Anholt <eric@anholt.net>
Date: Wed, 27 Sep 2017 20:01:04 +0000 (-0700)
Subject: broadcom/vc4: Fix release build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3e3772c1b3727c67da1cec503e7afb37e3786f53;p=mesa.git

broadcom/vc4: Fix release build

I remember thinking "gosh, it would be nice if I could do a kernel-style
'if (!IS_ENABLED(DEBUG))' instead of using an #ifdef, so the code was
compiled on both builds", and then forgot to test a release build anyway.

Fixes: a8fd58eae596 ("vc4: Add labels to BOs for debug builds or with VC4_DEBUG=surf set.")
Reported-by: Derek Foreman <derekf@osg.samsung.com>
---

diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c
index 9c4cc4cba88..b300fa5bd02 100644
--- a/src/gallium/drivers/vc4/vc4_bufmgr.c
+++ b/src/gallium/drivers/vc4/vc4_bufmgr.c
@@ -56,7 +56,7 @@ vc4_bo_label(struct vc4_screen *screen, struct vc4_bo *bo, const char *fmt, ...)
          * (for debugging a single app's allocation).
          */
 #ifndef DEBUG
-        if (!(VC4_DEBUG & VC4_DEBUG_SURFACE))
+        if (!(vc4_debug & VC4_DEBUG_SURFACE))
                 return;
 #endif
         va_list va;