From d3a80f2dda06593e5424814df9b3860f60c3076b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 12 Jul 2019 15:31:14 -0400 Subject: [PATCH] radeonsi/gfx10: remove the disable_ngg option because legacy VS hangs. Acked-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Samuel Pitoiset --- src/gallium/drivers/radeonsi/si_debug_options.h | 1 - src/gallium/drivers/radeonsi/si_pipe.c | 3 +-- src/gallium/drivers/radeonsi/si_state_shaders.c | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_debug_options.h b/src/gallium/drivers/radeonsi/si_debug_options.h index 9fdb0bc..d6cb315 100644 --- a/src/gallium/drivers/radeonsi/si_debug_options.h +++ b/src/gallium/drivers/radeonsi/si_debug_options.h @@ -7,6 +7,5 @@ OPT_BOOL(debug_disassembly, false, "Report shader disassembly as part of driver OPT_BOOL(halt_shaders, false, "Halt shaders at the start (will hang)") OPT_BOOL(vs_fetch_always_opencode, false, "Always open code vertex fetches (less efficient, purely for testing)") OPT_BOOL(prim_restart_tri_strips_only, false, "Only enable primitive restart for triangle strips") -OPT_BOOL(disable_ngg, false, "Unconditionally disable NGG (gfx10+)") #undef OPT_BOOL diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index d13b008..a6ed0bd 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -487,8 +487,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, if (!sctx->border_color_map) goto fail; - if (sctx->chip_class >= GFX10) - sctx->ngg = !sscreen->options.disable_ngg; + sctx->ngg = sctx->chip_class >= GFX10; /* Initialize context functions used by graphics and compute. */ if (sctx->chip_class >= GFX10) diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 52b3489..40572ac 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -2447,7 +2447,6 @@ static void si_init_shader_selector_async(void *job, int thread_index) sel->so.num_outputs != 0, &shader->key); if (sscreen->info.chip_class >= GFX10 && - !sscreen->options.disable_ngg && (((sel->type == PIPE_SHADER_VERTEX || sel->type == PIPE_SHADER_TESS_EVAL) && !shader->key.as_ls && !shader->key.as_es) || @@ -2982,8 +2981,7 @@ static void si_update_tess_uses_prim_id(struct si_context *sctx) static bool si_update_ngg(struct si_context *sctx) { - if (sctx->chip_class <= GFX9 || - sctx->screen->options.disable_ngg) + if (sctx->chip_class <= GFX9) return false; bool new_ngg = true; -- 2.7.4