diff options
| author | Marek Olšák <[email protected]> | 2019-07-12 15:31:14 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-07-19 20:16:19 -0400 |
| commit | d3a80f2dda06593e5424814df9b3860f60c3076b (patch) | |
| tree | 071279dd4e34f0cfa10a68064609a2268c826207 /src/gallium | |
| parent | 0f30223cf4f8dd23211052669576a4bf59631a8b (diff) | |
radeonsi/gfx10: remove the disable_ngg option
because legacy VS hangs.
Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_debug_options.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 3 | ||||
| -rw-r--r-- | 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 9fdb0bc5dad..d6cb3157632 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 d13b008965b..a6ed0bdca30 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 52b3489509d..40572acc23a 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; |