Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>
for the series, if you hadn't forgotten/pushed this yet. Sorry for the delay.
On Mon, Nov 6, 2017 at 3:05 AM, Dave Airlie <airl...@gmail.com> wrote:
> From: Dave Airlie <airl...@redhat.com>
>
> This register is the same on all gpus so far, so emit it in one
> place and also for the pre-gfx9 gpus set the value in the pipeline
> creation.
>
> Signed-off-by: Dave Airlie <airl...@redhat.com>
> ---
> src/amd/vulkan/radv_cmd_buffer.c | 14 +++++++-------
> src/amd/vulkan/radv_pipeline.c | 1 +
> 2 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/src/amd/vulkan/radv_cmd_buffer.c
> b/src/amd/vulkan/radv_cmd_buffer.c
> index cbd3f25d08e..188b2fdafa3 100644
> --- a/src/amd/vulkan/radv_cmd_buffer.c
> +++ b/src/amd/vulkan/radv_cmd_buffer.c
> @@ -731,13 +731,11 @@ radv_emit_hw_vs(struct radv_cmd_buffer *cmd_buffer,
>
> static void
> radv_emit_hw_es(struct radv_cmd_buffer *cmd_buffer,
> - struct radv_shader_variant *shader,
> - struct ac_es_output_info *outinfo)
> + struct radv_pipeline *pipeline,
> + struct radv_shader_variant *shader)
> {
> uint64_t va = radv_buffer_get_va(shader->bo) + shader->bo_offset;
>
> - radeon_set_context_reg(cmd_buffer->cs,
> R_028AAC_VGT_ESGS_RING_ITEMSIZE,
> - outinfo->esgs_itemsize / 4);
> radeon_set_sh_reg_seq(cmd_buffer->cs, R_00B320_SPI_SHADER_PGM_LO_ES,
> 4);
> radeon_emit(cmd_buffer->cs, va >> 8);
> radeon_emit(cmd_buffer->cs, va >> 40);
> @@ -806,7 +804,7 @@ radv_emit_vertex_shader(struct radv_cmd_buffer
> *cmd_buffer,
> if (vs->info.vs.as_ls)
> radv_emit_hw_ls(cmd_buffer, vs);
> else if (vs->info.vs.as_es)
> - radv_emit_hw_es(cmd_buffer, vs, &vs->info.vs.es_info);
> + radv_emit_hw_es(cmd_buffer, pipeline, vs);
> else
> radv_emit_hw_vs(cmd_buffer, pipeline, vs);
> }
> @@ -826,7 +824,7 @@ radv_emit_tess_shaders(struct radv_cmd_buffer *cmd_buffer,
>
> if (tes) {
> if (tes->info.tes.as_es)
> - radv_emit_hw_es(cmd_buffer, tes,
> &tes->info.tes.es_info);
> + radv_emit_hw_es(cmd_buffer, pipeline, tes);
> else
> radv_emit_hw_vs(cmd_buffer, pipeline, tes);
> }
> @@ -915,6 +913,9 @@ radv_emit_geometry_shader(struct radv_cmd_buffer
> *cmd_buffer,
> S_028B90_CNT(MIN2(gs_num_invocations, 127)) |
> S_028B90_ENABLE(gs_num_invocations > 0));
>
> + radeon_set_context_reg(cmd_buffer->cs,
> R_028AAC_VGT_ESGS_RING_ITEMSIZE,
> + pipeline->graphics.gs.vgt_esgs_ring_itemsize);
> +
> va = radv_buffer_get_va(gs->bo) + gs->bo_offset;
>
> if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9)
> {
> @@ -929,7 +930,6 @@ radv_emit_geometry_shader(struct radv_cmd_buffer
> *cmd_buffer,
>
> radeon_set_context_reg(cmd_buffer->cs,
> R_028A44_VGT_GS_ONCHIP_CNTL, pipeline->graphics.gs.vgt_gs_onchip_cntl);
> radeon_set_context_reg(cmd_buffer->cs,
> R_028A94_VGT_GS_MAX_PRIMS_PER_SUBGROUP,
> pipeline->graphics.gs.vgt_gs_max_prims_per_subgroup);
> - radeon_set_context_reg(cmd_buffer->cs,
> R_028AAC_VGT_ESGS_RING_ITEMSIZE,
> pipeline->graphics.gs.vgt_esgs_ring_itemsize);
> } else {
> radeon_set_sh_reg_seq(cmd_buffer->cs,
> R_00B220_SPI_SHADER_PGM_LO_GS, 4);
> radeon_emit(cmd_buffer->cs, va >> 8);
> diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
> index 4a70ab53eb3..5895a76ff4b 100644
> --- a/src/amd/vulkan/radv_pipeline.c
> +++ b/src/amd/vulkan/radv_pipeline.c
> @@ -1290,6 +1290,7 @@ calculate_gs_ring_sizes(struct radv_pipeline *pipeline)
> if (pipeline->device->physical_device->rad_info.chip_class <= VI)
> pipeline->graphics.esgs_ring_size = CLAMP(esgs_ring_size,
> min_esgs_ring_size, max_size);
>
> + pipeline->graphics.gs.vgt_esgs_ring_itemsize = es_info->esgs_itemsize
> / 4;
> pipeline->graphics.gsvs_ring_size = MIN2(gsvs_ring_size, max_size);
> }
>
> --
> 2.14.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
