etnaviv: make use of BITFIELD_BIT(..) macro

It helps to make the code easier to read.

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24216>
This commit is contained in:
Christian Gmeiner 2023-07-19 09:46:03 +02:00 committed by Marge Bot
parent 0a5fe1f524
commit 8305fb196c
2 changed files with 32 additions and 28 deletions

View file

@ -32,6 +32,7 @@
#include "etnaviv_compiler.h"
#include "util/compiler.h"
#include "util/log.h"
#include "util/macros.h"
struct etna_compile {
nir_shader *nir;
@ -67,8 +68,8 @@ struct etna_compile {
})
enum {
BYPASS_DST = 1,
BYPASS_SRC = 2,
BYPASS_DST = BITFIELD_BIT(0),
BYPASS_SRC = BITFIELD_BIT(1),
};
static inline bool is_sysval(nir_instr *instr)

View file

@ -27,38 +27,41 @@
#include "util/u_debug.h"
#include "util/log.h"
#include "util/macros.h"
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
/* Logging */
#define ETNA_DBG_MSGS 0x1 /* Warnings and non-fatal errors */
#define ETNA_DBG_FRAME_MSGS 0x2
#define ETNA_DBG_RESOURCE_MSGS 0x4
#define ETNA_DBG_COMPILER_MSGS 0x8
#define ETNA_DBG_LINKER_MSGS 0x10
#define ETNA_DBG_DUMP_SHADERS 0x20
#define ETNA_DRM_MSGS 0x40 /* Debug messages from DRM */
#define ETNA_DBG_PERF 0x80
enum etna_dbg {
/* Logging */
ETNA_DBG_MSGS = BITFIELD_BIT(0), /* Warnings and non-fatal errors */
ETNA_DBG_FRAME_MSGS = BITFIELD_BIT(1),
ETNA_DBG_RESOURCE_MSGS = BITFIELD_BIT(2),
ETNA_DBG_COMPILER_MSGS = BITFIELD_BIT(3),
ETNA_DBG_LINKER_MSGS = BITFIELD_BIT(4),
ETNA_DBG_DUMP_SHADERS = BITFIELD_BIT(5),
ETNA_DRM_MSGS = BITFIELD_BIT(6), /* Debug messages from DRM */
ETNA_DBG_PERF = BITFIELD_BIT(7),
/* Bypasses */
#define ETNA_DBG_NO_TS 0x1000 /* Disable TS */
#define ETNA_DBG_NO_AUTODISABLE 0x2000 /* Disable autodisable */
#define ETNA_DBG_NO_SUPERTILE 0x4000 /* Disable supertile */
#define ETNA_DBG_NO_EARLY_Z 0x8000 /* Disable early z */
#define ETNA_DBG_CFLUSH_ALL 0x10000 /* Flush before every state update + draw call */
#define ETNA_DBG_FINISH_ALL 0x20000 /* Finish on every flush */
#define ETNA_DBG_FLUSH_ALL 0x40000 /* Flush after every rendered primitive */
#define ETNA_DBG_ZERO 0x80000 /* Zero all resources after allocation */
#define ETNA_DBG_DRAW_STALL 0x100000 /* Stall FE/PE after every draw op */
#define ETNA_DBG_SHADERDB 0x200000 /* dump program compile information */
#define ETNA_DBG_NO_SINGLEBUF 0x400000 /* disable single buffer feature */
#define ETNA_DBG_DEQP 0x800000 /* Hacks to run dEQP GLES3 tests */
#define ETNA_DBG_NOCACHE 0x1000000 /* Disable shader cache */
#define ETNA_DBG_LINEAR_PE 0x2000000 /* Enable linear PE */
#define ETNA_DBG_MSAA 0x4000000 /* Enable MSAA */
#define ETNA_DBG_SHARED_TS 0x8000000 /* Enable TS sharing */
/* Bypasses */
ETNA_DBG_NO_TS = BITFIELD_BIT(12), /* Disable TS */
ETNA_DBG_NO_AUTODISABLE = BITFIELD_BIT(13), /* Disable autodisable */
ETNA_DBG_NO_SUPERTILE = BITFIELD_BIT(14), /* Disable supertile */
ETNA_DBG_NO_EARLY_Z = BITFIELD_BIT(15), /* Disable early z */
ETNA_DBG_CFLUSH_ALL = BITFIELD_BIT(16), /* Flush before every state update + draw call */
ETNA_DBG_FINISH_ALL = BITFIELD_BIT(17), /* Finish on every flush */
ETNA_DBG_FLUSH_ALL = BITFIELD_BIT(18), /* Flush after every rendered primitive */
ETNA_DBG_ZERO = BITFIELD_BIT(19), /* Zero all resources after allocation */
ETNA_DBG_DRAW_STALL = BITFIELD_BIT(20), /* Stall FE/PE after every draw op */
ETNA_DBG_SHADERDB = BITFIELD_BIT(21), /* dump program compile information */
ETNA_DBG_NO_SINGLEBUF = BITFIELD_BIT(22), /* disable single buffer feature */
ETNA_DBG_DEQP = BITFIELD_BIT(23), /* Hacks to run dEQP GLES3 tests */
ETNA_DBG_NOCACHE = BITFIELD_BIT(24), /* Disable shader cache */
ETNA_DBG_LINEAR_PE = BITFIELD_BIT(25), /* Enable linear PE */
ETNA_DBG_MSAA = BITFIELD_BIT(26), /* Enable MSAA */
ETNA_DBG_SHARED_TS = BITFIELD_BIT(27), /* Enable TS sharing */
};
extern int etna_mesa_debug; /* set in etnaviv_screen.c from ETNA_MESA_DEBUG */