diff options
author | Eric Anholt <[email protected]> | 2018-01-03 12:42:13 -0800 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2018-01-12 21:51:47 -0800 |
commit | 2c48ce74f7b8ac9a2a47f6f8db7fe9b1639e3755 (patch) | |
tree | 2a5d05c5859f1980483260b267376330e83c99b0 /src/gallium/drivers/vc5/vc5_job.c | |
parent | fb4face86ad9f58ea0410c3633fda211836b7df5 (diff) |
broadcom/vc5: Convert vc5_cl.h to use the V3DX() macros.
To conditionally compile cl_emit() macros per V3D version, we need it to
expand to whatever V3D we're building for. This required emitting #define
V3D_VERSION 33 in all our currently 3.3-only code.
Diffstat (limited to 'src/gallium/drivers/vc5/vc5_job.c')
-rw-r--r-- | src/gallium/drivers/vc5/vc5_job.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/vc5/vc5_job.c b/src/gallium/drivers/vc5/vc5_job.c index 0141802b43e..07d39f3b229 100644 --- a/src/gallium/drivers/vc5/vc5_job.c +++ b/src/gallium/drivers/vc5/vc5_job.c @@ -28,11 +28,14 @@ #include <xf86drm.h> #include "vc5_context.h" +/* The OQ/semaphore packets are the same across V3D versions. */ +#define V3D_VERSION 33 +#include "broadcom/cle/v3dx_pack.h" +#include "broadcom/common/v3d_macros.h" #include "util/hash_table.h" #include "util/ralloc.h" #include "util/set.h" #include "broadcom/clif/clif_dump.h" -#include "broadcom/cle/v3d_packet_v33_pack.h" static void remove_from_ht(struct hash_table *ht, void *key) |