fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-23 06:10:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

vc4: fix release build

Browse source 
Mesa's DEBUG and assert's NDEBUG are not tied to each other, so we need
to explicitly compile this code out.

Fixes: 3df7892878 "vc4: Drop reloc_count tracking for debug
       asserts on non-debug builds."
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit 5d44e35a8f)
This commit is contained in:
Eric Engestrom 2017-10-25 14:08:58 +01:00 • committed by Emil Velikov
parent 1664322838
commit fb09360ea5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/drivers/vc4/vc4_cl.h
View file

@ -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
}