radv: Fix single stage constant flush with merged shaders.

e.g. a VERTEX only flush with tess on Vega should look at the TCS
to see which bits are needed.

CC: <mesa-stable@lists.freedesktop.org>
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1953
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Bas Nieuwenhuizen 2019-10-18 01:21:29 +02:00
parent 1b65c49c58
commit fd21ee8b52

View file

@ -2313,14 +2313,15 @@ radv_flush_constants(struct radv_cmd_buffer *cmd_buffer,
return;
radv_foreach_stage(stage, stages) {
if (!pipeline->shaders[stage])
shader = radv_get_shader(pipeline, stage);
if (!shader)
continue;
need_push_constants |= pipeline->shaders[stage]->info.loads_push_constants;
need_push_constants |= pipeline->shaders[stage]->info.loads_dynamic_offsets;
need_push_constants |= shader->info.loads_push_constants;
need_push_constants |= shader->info.loads_dynamic_offsets;
uint8_t base = pipeline->shaders[stage]->info.base_inline_push_consts;
uint8_t count = pipeline->shaders[stage]->info.num_inline_push_consts;
uint8_t base = shader->info.base_inline_push_consts;
uint8_t count = shader->info.num_inline_push_consts;
radv_emit_inline_push_consts(cmd_buffer, pipeline, stage,
AC_UD_INLINE_PUSH_CONSTANTS,