[Mesa-dev] [PATCH 1/3] radv: do not pass a pipeline object to radv_emit_graphics_pipeline()

[Bas Nieuwenhuizen]

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

for all 3.

On Mon, Sep 11, 2017 at 5:52 PM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> To be consistent with radv_emit_compute_pipeline().
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  src/amd/vulkan/radv_cmd_buffer.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
> index b223bc0009..3e9706e421 100644
> --- a/src/amd/vulkan/radv_cmd_buffer.c
> +++ b/src/amd/vulkan/radv_cmd_buffer.c
> @@ -953,9 +953,10 @@ static void polaris_set_vgt_vertex_reuse(struct radv_cmd_buffer *cmd_buffer,
>  }
>
>  static void
> -radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer,
> -                           struct radv_pipeline *pipeline)
> +radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer)
>  {
> +       struct radv_pipeline *pipeline = cmd_buffer->state.pipeline;
> +
>         if (!pipeline || cmd_buffer->state.emitted_pipeline == pipeline)
>                 return;
>
> @@ -1707,7 +1708,6 @@ radv_cmd_buffer_flush_state(struct radv_cmd_buffer *cmd_buffer,
>                             bool indirect_draw,
>                             uint32_t draw_vertex_count)
>  {
> -       struct radv_pipeline *pipeline = cmd_buffer->state.pipeline;
>         uint32_t ia_multi_vgt_param;
>
>         MAYBE_UNUSED unsigned cdw_max = radeon_check_space(cmd_buffer->device->ws,
> @@ -1717,7 +1717,7 @@ radv_cmd_buffer_flush_state(struct radv_cmd_buffer *cmd_buffer,
>                 return;
>
>         if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_PIPELINE)
> -               radv_emit_graphics_pipeline(cmd_buffer, pipeline);
> +               radv_emit_graphics_pipeline(cmd_buffer);
>
>         if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_RENDER_TARGETS)
>                 radv_emit_framebuffer_state(cmd_buffer);
> --
> 2.14.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev