fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: re-emit prolog inputs when the nontrivial divisors state changed

Browse source 
If the application first uses nontrivial divisors, the driver emits
the vertex shader VA to the upload BO rather than directly via the
user SGPRs locations. But, if the vertex input dynamic state changes,
the driver might select a different VS prolog that no longer needs
nontrivial divisors.

In this case, the driver needs to re-emit the prolog inputs because
otherwise the VS prolog will jump to the PC that is emitted via the
user SGPR locations, and the previous one was somewhere in the
upload BO...

This fixes a GPU hang with Bioshock and Zink.

Fixes: d9c7a17542 ("radv: enable VK_EXT_vertex_input_dynamic_state")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13377>
This commit is contained in:
Samuel Pitoiset 2021-10-15 14:27:38 +02:00
parent 8ec6824335
commit b6a69dbb40
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -2911,7 +2911,8 @@ emit_prolog_inputs(struct radv_cmd_buffer *cmd_buffer, struct radv_shader_varian
uint32_t nontrivial_divisors, bool pipeline_is_dirty)
{
/* no need to re-emit anything in this case */
if (!nontrivial_divisors && !pipeline_is_dirty)
if (!nontrivial_divisors && !pipeline_is_dirty && cmd_buffer->state.emitted_vs_prolog &&
!cmd_buffer->state.emitted_vs_prolog->nontrivial_divisors)
return;
struct radv_vs_input_state *state = &cmd_buffer->state.dynamic_vs_input;

3
src/amd/vulkan/radv_shader.c
View file

@ -1971,6 +1971,9 @@ radv_create_vs_prolog(struct radv_device *device, const struct radv_vs_prolog_ke
struct radv_prolog_binary *binary = NULL;
aco_compile_vs_prolog(&options, &info, key, &args, &binary);
struct radv_shader_prolog *prolog = upload_vs_prolog(device, binary, info.wave_size);
if (prolog) {
prolog->nontrivial_divisors = key->state->nontrivial_divisors;
}
free(binary);
return prolog;

1
src/amd/vulkan/radv_shader.h
View file

@ -479,6 +479,7 @@ struct radv_shader_prolog {
union radv_shader_arena_block *alloc;
uint32_t rsrc1;
uint8_t num_preserved_sgprs;
bool nontrivial_divisors;
};
void radv_optimize_nir(const struct radv_device *device, struct nir_shader *shader,