diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2017-05-27 01:22:25 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2017-06-07 18:43:42 +0200 |
| commit | 8147c4a4a58a9328a07fd358b54622de0d01c374 (patch) | |
| tree | 5161bea7bfbc3eb736dae53c55b4f3fe529eb741 | |
| parent | 86cc8097266c2bd9d8a6ccc3d7f61391f13119be (diff) | |
radeonsi: move handling of DBG_NO_OPT_VARIANT into si_shader_selector_key
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 5a22add0abc..55e881ca529 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1438,6 +1438,9 @@ static inline void si_shader_selector_key(struct pipe_context *ctx, default: assert(0); } + + if (unlikely(sctx->screen->b.debug_flags & DBG_NO_OPT_VARIANT)) + memset(&key->opt, 0, sizeof(key->opt)); } static void si_build_shader_variant(void *job, int thread_index) @@ -1533,10 +1536,6 @@ static int si_shader_select_with_key(struct si_screen *sscreen, struct si_shader *current = state->current; struct si_shader *iter, *shader = NULL; - if (unlikely(sscreen->b.debug_flags & DBG_NO_OPT_VARIANT)) { - memset(&key->opt, 0, sizeof(key->opt)); - } - again: /* Check if we don't need to change anything. * This path is also used for most shaders that don't need multiple |