From e4552632aabbfc8f4fcafff216be50acfa928fa8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 6 Oct 2022 10:33:19 -0600
Subject: [PATCH] draw: asst. clean-ups in draw_pt.c

Signed-off-by: Brian Paul <brianp@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19024>
---
 src/gallium/auxiliary/draw/draw_pt.c | 40 ++++++++++++----------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c
index ac0137c8553..012b3e03302 100644
--- a/src/gallium/auxiliary/draw/draw_pt.c
+++ b/src/gallium/auxiliary/draw/draw_pt.c
@@ -61,9 +61,6 @@ draw_pt_arrays(struct draw_context *draw,
                const struct pipe_draw_start_count_bias *draw_info,
                unsigned num_draws)
 {
-   struct draw_pt_front_end *frontend = NULL;
-   struct draw_pt_middle_end *middle = NULL;
-   unsigned opt = PT_SHADE;
    enum pipe_prim_type out_prim = prim;
 
    if (draw->gs.geometry_shader)
@@ -71,13 +68,12 @@ draw_pt_arrays(struct draw_context *draw,
    else if (draw->tes.tess_eval_shader)
       out_prim = get_tes_output_prim(draw->tes.tess_eval_shader);
 
+   unsigned opt = PT_SHADE;
    if (!draw->render) {
       opt |= PT_PIPELINE;
    }
 
-   if (draw_need_pipeline(draw,
-                           draw->rasterizer,
-                           out_prim)) {
+   if (draw_need_pipeline(draw, draw->rasterizer, out_prim)) {
       opt |= PT_PIPELINE;
    }
 
@@ -87,6 +83,7 @@ draw_pt_arrays(struct draw_context *draw,
       opt |= PT_CLIPTEST;
    }
 
+   struct draw_pt_middle_end *middle;
    if (draw->pt.middle.llvm) {
       middle = draw->pt.middle.llvm;
    } else {
@@ -96,8 +93,7 @@ draw_pt_arrays(struct draw_context *draw,
          middle = draw->pt.middle.general;
    }
 
-   frontend = draw->pt.frontend;
-
+   struct draw_pt_front_end *frontend = draw->pt.frontend;
    if (frontend) {
       if (draw->pt.prim != prim || draw->pt.opt != opt) {
          /* In certain conditions switching primitives requires us to flush
@@ -144,8 +140,10 @@ draw_pt_arrays(struct draw_context *draw,
       if (prim == PIPE_PRIM_PATCHES) {
          first = draw->pt.vertices_per_patch;
          incr = draw->pt.vertices_per_patch;
-      } else
+      } else {
          draw_pt_split_prim(prim, &first, &incr);
+      }
+
       count = draw_pt_trim_count(draw_info[i].count, first, incr);
       draw->pt.user.eltBias = draw->pt.user.eltSize ?
                               (index_bias_varies ? draw_info[i].index_bias : draw_info[0].index_bias) :
@@ -393,6 +391,7 @@ prim_restart_loop(struct draw_context *draw,
    }
 }
 
+
 /**
  * For drawing prims with primitive restart enabled.
  * Scan for restart indexes and draw the runs of elements/vertices between
@@ -404,20 +403,17 @@ draw_pt_arrays_restart(struct draw_context *draw,
                        const struct pipe_draw_start_count_bias *draw_info,
                        unsigned num_draws)
 {
-   const enum pipe_prim_type prim = info->mode;
-
    assert(info->primitive_restart);
 
    if (draw->pt.user.eltSize) {
       /* indexed prims (draw_elements) */
       for (unsigned i = 0; i < num_draws; i++)
          prim_restart_loop(draw, info, &draw_info[i], draw->pt.user.elts);
-   }
-   else {
+   } else {
       /* Non-indexed prims (draw_arrays).
        * Primitive restart should have been handled in gallium frontends.
        */
-      draw_pt_arrays(draw, prim, info->index_bias_varies, draw_info, num_draws);
+      draw_pt_arrays(draw, info->mode, info->index_bias_varies, draw_info, num_draws);
    }
 }
 
@@ -436,8 +432,8 @@ resolve_draw_info(const struct pipe_draw_info *raw_info,
                   struct pipe_draw_start_count_bias *draw,
                   struct pipe_vertex_buffer *vertex_buffer)
 {
-   memcpy(info, raw_info, sizeof(struct pipe_draw_info));
-   memcpy(draw, raw_draw, sizeof(struct pipe_draw_start_count_bias));
+   *info = *raw_info;
+   *draw = *raw_draw;
 
    struct draw_so_target *target =
       (struct draw_so_target *)indirect->count_from_stream_output;
@@ -478,8 +474,7 @@ draw_instances(struct draw_context *draw,
 
       if (info->primitive_restart) {
          draw_pt_arrays_restart(draw, info, draws, num_draws);
-      }
-      else {
+      } else {
          draw_pt_arrays(draw, info->mode, info->index_bias_varies,
                         draws, num_draws);
       }
@@ -502,7 +497,6 @@ draw_vbo(struct draw_context *draw,
          unsigned num_draws,
          uint8_t patch_vertices)
 {
-   unsigned index_limit;
    unsigned fpstate = util_fpstate_get();
    struct pipe_draw_info resolved_info;
    struct pipe_draw_start_count_bias resolved_draw;
@@ -578,10 +572,10 @@ draw_vbo(struct draw_context *draw,
                            : use_draws[0].index_bias);
    }
 
-   index_limit = util_draw_max_index(draw->pt.vertex_buffer,
-                                     draw->pt.vertex_element,
-                                     draw->pt.nr_vertex_elements,
-                                     use_info);
+   unsigned index_limit = util_draw_max_index(draw->pt.vertex_buffer,
+                                              draw->pt.vertex_element,
+                                              draw->pt.nr_vertex_elements,
+                                              use_info);
 #ifdef DRAW_LLVM_AVAILABLE
    if (!draw->llvm)
 #endif