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

radeonsi: move fixing ngg_culling into si_update_shaders

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18195>
This commit is contained in:
Marek Olšák
2022-08-14 03:57:58 -04:00
committed by Marge Bot
parent e5a9203159
commit 58539e976b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeonsi/si_state_draw.cpp
+6 -6
View File
@@ -377,6 +377,12 @@ static bool si_update_shaders(struct si_context *sctx)
}
}
/* si_shader_select_with_key can clear the ngg_culling in the shader key if the shader
* compilation hasn't finished. Set it to the same value in si_context.
*/
if (GFX_VERSION >= GFX10 && NGG)
sctx->ngg_culling = si_get_vs_inline(sctx, HAS_TESS, HAS_GS)->current->key.ge.opt.ngg_culling;
sctx->do_update_shaders = false;
return true;
}
@@ -2437,12 +2443,6 @@ static void si_draw(struct pipe_context *ctx,
DRAW_CLEANUP;
return;
}
/* si_update_shaders can clear the ngg_culling in the shader key if the shader compilation
* hasn't finished. Set it to the correct value in si_context.
*/
if (GFX_VERSION >= GFX10 && NGG)
sctx->ngg_culling = si_get_vs_inline(sctx, HAS_TESS, HAS_GS)->current->key.ge.opt.ngg_culling;
}
/* Since we've called si_context_add_resource_size for vertex buffers,