Mesa (master): vc4: fix release build
Eric Engeström
eric_engestrom at kemper.freedesktop.org
Fri Oct 27 11:01:17 UTC 2017
Module: Mesa
Branch: master
Commit: 5d44e35a8f3967b40db153fdcedb9294d44ae5c4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d44e35a8f3967b40db153fdcedb9294d44ae5c4
Author: Eric Engestrom <eric.engestrom at imgtec.com>
Date: Wed Oct 25 14:08:58 2017 +0100
vc4: fix release build
Mesa's DEBUG and assert's NDEBUG are not tied to each other, so we need
to explicitly compile this code out.
Fixes: 3df78928786134874eafa "vc4: Drop reloc_count tracking for debug
asserts on non-debug builds."
Cc: Eric Anholt <eric at anholt.net>
Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/gallium/drivers/vc4/vc4_cl.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/gallium/drivers/vc4/vc4_cl.h b/src/gallium/drivers/vc4/vc4_cl.h
index 036132697a..8df9dbfe65 100644
--- a/src/gallium/drivers/vc4/vc4_cl.h
+++ b/src/gallium/drivers/vc4/vc4_cl.h
@@ -61,7 +61,7 @@ struct vc4_cl {
struct vc4_cl_out *next;
struct vc4_cl_out *reloc_next;
uint32_t size;
-#ifdef DEBUG
+#ifndef NDEBUG
uint32_t reloc_count;
#endif
};
@@ -163,8 +163,8 @@ static inline void
cl_start_reloc(struct vc4_cl *cl, struct vc4_cl_out **out, uint32_t n)
{
assert(n == 1 || n == 2);
-#ifdef DEBUG
assert(cl->reloc_count == 0);
+#ifndef NDEBUG
cl->reloc_count = n;
#endif
@@ -177,8 +177,8 @@ cl_start_reloc(struct vc4_cl *cl, struct vc4_cl_out **out, uint32_t n)
static inline struct vc4_cl_out *
cl_start_shader_reloc(struct vc4_cl *cl, uint32_t n)
{
-#ifdef DEBUG
assert(cl->reloc_count == 0);
+#ifndef NDEBUG
cl->reloc_count = n;
#endif
cl->reloc_next = cl->next;
@@ -196,7 +196,7 @@ cl_reloc(struct vc4_job *job, struct vc4_cl *cl, struct vc4_cl_out **cl_out,
*(uint32_t *)cl->reloc_next = vc4_gem_hindex(job, bo);
cl_advance(&cl->reloc_next, 4);
-#ifdef DEBUG
+#ifndef NDEBUG
cl->reloc_count--;
#endif
@@ -211,7 +211,7 @@ cl_aligned_reloc(struct vc4_job *job, struct vc4_cl *cl,
*(uint32_t *)cl->reloc_next = vc4_gem_hindex(job, bo);
cl_advance(&cl->reloc_next, 4);
-#ifdef DEBUG
+#ifndef NDEBUG
cl->reloc_count--;
#endif
@@ -297,7 +297,7 @@ cl_pack_emit_reloc(struct vc4_cl *cl, const struct vc4_cl_reloc *reloc)
*(uint32_t *)cl->reloc_next = vc4_gem_hindex(cl->job, reloc->bo);
cl_advance(&cl->reloc_next, 4);
-#ifdef DEBUG
+#ifndef NDEBUG
cl->reloc_count--;
#endif
}
More information about the mesa-commit
mailing list