diff options
| author | Marek Olšák <[email protected]> | 2017-08-29 13:14:34 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-09-04 15:10:39 +0200 |
| commit | 468c1310339e6fb79d275c823b51412dcbe3a317 (patch) | |
| tree | 64baaa2181dac00a7413190e216e617f7efdaf45 /src/gallium/drivers/radeon | |
| parent | 50283109aa2b1a3fd92e92eb1c85426444ef508e (diff) | |
gallium/radeon: sort DBG shader flags according to pipe_shader_type
Reviewed-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 20 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 25 |
2 files changed, 14 insertions, 31 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index 7c12565d162..99172c6c55f 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -899,8 +899,7 @@ static const char *r600_get_family_name(const struct r600_common_screen *rscreen static void r600_disk_cache_create(struct r600_common_screen *rscreen) { /* Don't use the cache if shader dumping is enabled. */ - if (rscreen->debug_flags & - (DBG_FS | DBG_VS | DBG_TCS | DBG_TES | DBG_GS | DBG_PS | DBG_CS)) + if (rscreen->debug_flags & DBG_ALL_SHADERS) return; uint32_t mesa_timestamp; @@ -1535,22 +1534,7 @@ void r600_destroy_common_screen(struct r600_common_screen *rscreen) bool r600_can_dump_shader(struct r600_common_screen *rscreen, unsigned processor) { - switch (processor) { - case PIPE_SHADER_VERTEX: - return (rscreen->debug_flags & DBG_VS) != 0; - case PIPE_SHADER_TESS_CTRL: - return (rscreen->debug_flags & DBG_TCS) != 0; - case PIPE_SHADER_TESS_EVAL: - return (rscreen->debug_flags & DBG_TES) != 0; - case PIPE_SHADER_GEOMETRY: - return (rscreen->debug_flags & DBG_GS) != 0; - case PIPE_SHADER_FRAGMENT: - return (rscreen->debug_flags & DBG_PS) != 0; - case PIPE_SHADER_COMPUTE: - return (rscreen->debug_flags & DBG_CS) != 0; - default: - return false; - } + return rscreen->debug_flags & (1 << processor); } bool r600_extra_shader_checks(struct r600_common_screen *rscreen, unsigned processor) diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 8c70e91ae03..9f9b42bbece 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -70,20 +70,19 @@ struct u_log_context; #define R600_NOT_QUERY 0xffffffff /* Debug flags. */ -/* logging and features */ -#define DBG_TEX (1 << 0) -#define DBG_NIR (1 << 1) -#define DBG_COMPUTE (1 << 2) -#define DBG_VM (1 << 3) +#define DBG_VS (1 << PIPE_SHADER_VERTEX) +#define DBG_PS (1 << PIPE_SHADER_FRAGMENT) +#define DBG_GS (1 << PIPE_SHADER_GEOMETRY) +#define DBG_TCS (1 << PIPE_SHADER_TESS_CTRL) +#define DBG_TES (1 << PIPE_SHADER_TESS_EVAL) +#define DBG_CS (1 << PIPE_SHADER_COMPUTE) +#define DBG_ALL_SHADERS (DBG_FS - 1) +#define DBG_FS (1 << 6) /* fetch shader */ +#define DBG_TEX (1 << 7) +#define DBG_NIR (1 << 8) +#define DBG_COMPUTE (1 << 9) /* gap */ -/* shader logging */ -#define DBG_FS (1 << 5) -#define DBG_VS (1 << 6) -#define DBG_GS (1 << 7) -#define DBG_PS (1 << 8) -#define DBG_CS (1 << 9) -#define DBG_TCS (1 << 10) -#define DBG_TES (1 << 11) +#define DBG_VM (1 << 11) #define DBG_NO_IR (1 << 12) #define DBG_NO_TGSI (1 << 13) #define DBG_NO_ASM (1 << 14) |