diff options
| author | Eric Engestrom <[email protected]> | 2017-10-25 14:08:58 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2017-10-27 11:57:03 +0100 |
| commit | 5d44e35a8f3967b40db153fdcedb9294d44ae5c4 (patch) | |
| tree | 0d4c71aa7defa4faf2e7709255ecc57f81ed57d3 /src/gallium | |
| parent | 0b131ca427d788ae08426bdeddb8f4bd3c7da202 (diff) | |
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 <[email protected]>
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_cl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/vc4/vc4_cl.h b/src/gallium/drivers/vc4/vc4_cl.h index 036132697a9..8df9dbfe65a 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 } |