KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonsi/gfx10: remove the disable_ngg option 

because legacy VS hangs.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Marek Olšák 2019-07-12 15:31:14 -04:00
parent 0f30223cf4
commit d3a80f2dda
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/radeonsi/si_debug_options.h
View File

@ -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(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(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(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 #undef OPT_BOOL

3
src/gallium/drivers/radeonsi/si_pipe.c
View File

@ -487,8 +487,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
if (!sctx->border_color_map) if (!sctx->border_color_map)
goto fail; goto fail;
if (sctx->chip_class >= GFX10) sctx->ngg = sctx->chip_class >= GFX10;
sctx->ngg = !sscreen->options.disable_ngg;
/* Initialize context functions used by graphics and compute. */ /* Initialize context functions used by graphics and compute. */
if (sctx->chip_class >= GFX10) if (sctx->chip_class >= GFX10)

4
src/gallium/drivers/radeonsi/si_state_shaders.c
View File

@ -2447,7 +2447,6 @@ static void si_init_shader_selector_async(void *job, int thread_index)
sel->so.num_outputs != 0, sel->so.num_outputs != 0,
&shader->key); &shader->key);
if (sscreen->info.chip_class >= GFX10 && if (sscreen->info.chip_class >= GFX10 &&
!sscreen->options.disable_ngg &&
(((sel->type == PIPE_SHADER_VERTEX || (((sel->type == PIPE_SHADER_VERTEX ||
sel->type == PIPE_SHADER_TESS_EVAL) && sel->type == PIPE_SHADER_TESS_EVAL) &&
!shader->key.as_ls && !shader->key.as_es) || !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) static bool si_update_ngg(struct si_context *sctx)
{ {
if (sctx->chip_class <= GFX9 || if (sctx->chip_class <= GFX9)
sctx->screen->options.disable_ngg)
return false; return false;
bool new_ngg = true; bool new_ngg = true;