Merge Mesa 22.3.4

1 files changed, 46 insertions, 34 deletions

diff --git a/lib/mesa/src/gallium/drivers/llvmpipe/lp_setup_context.h b/lib/mesa/src/gallium/drivers/llvmpipe/lp_setup_context.h
index fac84fb56..d848a1440 100644
--- a/lib/mesa/src/gallium/drivers/llvmpipe/lp_setup_context.h
+++ b/lib/mesa/src/gallium/drivers/llvmpipe/lp_setup_context.h
@@ -77,7 +77,7 @@ struct lp_setup_context
    struct pipe_context *pipe;
    struct vertex_info *vertex_info;
    uint view_index;
-   uint prim;
+   enum pipe_prim_type prim;
    uint vertex_size;
    uint nr_vertices;
    uint sprite_coord_enable, sprite_coord_origin;
@@ -138,7 +138,7 @@ struct lp_setup_context
       SETUP_CLEARED,    /**< scene exists but has only clears */
       SETUP_ACTIVE      /**< scene exists and has at least one draw/query */
    } state;
-   
+
    struct {
       const struct lp_rast_state *stored; /**< what's in the scene */
       struct lp_rast_state current;  /**< currently set state */
@@ -168,35 +168,35 @@ struct lp_setup_context
       uint8_t *stored;
    } blend_color;
 
-
    struct {
       const struct lp_setup_variant *variant;
    } setup;
 
    unsigned dirty;   /**< bitmask of LP_SETUP_NEW_x bits */
 
-   void (*point)( struct lp_setup_context *,
-                  const float (*v0)[4]);
+   void (*point)(struct lp_setup_context *,
+                 const float (*v0)[4]);
 
-   void (*line)( struct lp_setup_context *,
-                 const float (*v0)[4],
-                 const float (*v1)[4]);
+   void (*line)(struct lp_setup_context *,
+                const float (*v0)[4],
+                const float (*v1)[4]);
 
-   void (*triangle)( struct lp_setup_context *,
-                     const float (*v0)[4],
-                     const float (*v1)[4],
-                     const float (*v2)[4]);
+   void (*triangle)(struct lp_setup_context *,
+                    const float (*v0)[4],
+                    const float (*v1)[4],
+                    const float (*v2)[4]);
 
    boolean
-   (*rect)( struct lp_setup_context *,
-            const float (*v0)[4],
-            const float (*v1)[4],
-            const float (*v2)[4],
-            const float (*v3)[4],
-            const float (*v4)[4],
-            const float (*v5)[4]);
+   (*rect)(struct lp_setup_context *,
+           const float (*v0)[4],
+           const float (*v1)[4],
+           const float (*v2)[4],
+           const float (*v3)[4],
+           const float (*v4)[4],
+           const float (*v5)[4]);
 };
 
+
 static inline void
 scissor_planes_needed(boolean scis_planes[4], const struct u_rect *bbox,
                       const struct u_rect *scissor)
@@ -211,24 +211,36 @@ scissor_planes_needed(boolean scis_planes[4], const struct u_rect *bbox,
    scis_planes[3] = (bbox->y1 > scissor->y1);
 }
 
+
 void
 lp_setup_add_scissor_planes(const struct u_rect *scissor,
                             struct lp_rast_plane *plane_s,
                             boolean s_planes[4], bool multisample);
 
-void lp_setup_choose_triangle( struct lp_setup_context *setup );
-void lp_setup_choose_line( struct lp_setup_context *setup );
-void lp_setup_choose_point( struct lp_setup_context *setup );
-void lp_setup_choose_rect( struct lp_setup_context *setup );
+void
+lp_setup_choose_triangle(struct lp_setup_context *setup);
 
-void lp_setup_init_vbuf(struct lp_setup_context *setup);
+void
+lp_setup_choose_line(struct lp_setup_context *setup);
 
-boolean lp_setup_update_state( struct lp_setup_context *setup,
-                            boolean update_scene);
+void
+lp_setup_choose_point(struct lp_setup_context *setup);
 
-void lp_setup_destroy( struct lp_setup_context *setup );
+void
+lp_setup_choose_rect(struct lp_setup_context *setup);
 
-boolean lp_setup_flush_and_restart(struct lp_setup_context *setup);
+void
+lp_setup_init_vbuf(struct lp_setup_context *setup);
+
+boolean
+lp_setup_update_state(struct lp_setup_context *setup,
+                      boolean update_scene);
+
+void
+lp_setup_destroy(struct lp_setup_context *setup);
+
+boolean
+lp_setup_flush_and_restart(struct lp_setup_context *setup);
 
 boolean
 lp_setup_whole_tile(struct lp_setup_context *setup,
@@ -257,12 +269,12 @@ lp_rect_cw(struct lp_setup_context *setup,
            const float (*v2)[4],
            boolean frontfacing);
 
-void 
-lp_setup_triangle_ccw( struct lp_setup_context *setup,
-                       const float (*v0)[4],
-                       const float (*v1)[4],
-                       const float (*v2)[4],
-                       boolean front );
+void
+lp_setup_triangle_ccw(struct lp_setup_context *setup,
+                      const float (*v0)[4],
+                      const float (*v1)[4],
+                      const float (*v2)[4],
+                      boolean front);
 
 struct lp_rast_triangle *
 lp_setup_alloc_triangle(struct lp_scene *scene,