treewide: style fixes after replace the usage of ubyte/ushort with uint8_t/uint16_t

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23577>

diff --git a/src/gallium/auxiliary/draw/draw_pipe.c b/src/gallium/auxiliary/draw/draw_pipe.c
index 646aa19..8c77622 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pipe.c
+++ b/src/gallium/auxiliary/draw/draw_pipe.c
@@ -204,13 +204,13 @@ do_triangle(struct draw_context *draw,
 #define GET_ELT(idx) (MIN2(elts[idx], max_index))
 
 #define FUNC pipe_run_elts
-#define FUNC_VARS                               \
+#define FUNC_VARS                              \
    struct draw_context *draw,                  \
-   enum mesa_prim prim,                   \
+   enum mesa_prim prim,                        \
    unsigned prim_flags,                        \
    struct vertex_header *vertices,             \
    unsigned stride,                            \
-   const uint16_t *elts,                         \
+   const uint16_t *elts,                       \
    unsigned count,                             \
    unsigned max_index
 

diff --git a/src/gallium/drivers/llvmpipe/lp_surface.c b/src/gallium/drivers/llvmpipe/lp_surface.c
index 5ad475e..689a2dd 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_surface.c
@@ -281,10 +281,10 @@ llvmpipe_get_sample_position(struct pipe_context *pipe,
 
 static void
 lp_clear_color_texture_helper(struct pipe_transfer *dst_trans,
-                                uint8_t *dst_map,
-                                enum pipe_format format,
-                                const union pipe_color_union *color,
-                                unsigned width, unsigned height,
+                              uint8_t *dst_map,
+                              enum pipe_format format,
+                              const union pipe_color_union *color,
+                              unsigned width, unsigned height,
                               unsigned depth)
 {
    union util_color uc;
@@ -375,11 +375,11 @@ lp_clear_depth_stencil_texture_msaa(struct pipe_context *pipe,
    }
 
    uint8_t *dst_map = llvmpipe_transfer_map_ms(pipe,
-                                             texture,
-                                             0,
-                                             (need_rmw ? PIPE_MAP_READ_WRITE :
-                                              PIPE_MAP_WRITE),
-                                             sample, box, &dst_trans);
+                                               texture,
+                                               0,
+                                               (need_rmw ? PIPE_MAP_READ_WRITE :
+                                                PIPE_MAP_WRITE),
+                                               sample, box, &dst_trans);
    assert(dst_map);
    if (!dst_map)
       return;

diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 17a0b7c..c186633 100644 (file)
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -984,8 +984,8 @@ static void* r300_render_map_vertices(struct vbuf_render* render)
 }
 
 static void r300_render_unmap_vertices(struct vbuf_render* render,
-                                             uint16_t min,
-                                             uint16_t max)
+                                       uint16_t min,
+                                       uint16_t max)
 {
     struct r300_render* r300render = r300_render(render);
     struct r300_context* r300 = r300render->r300;

diff --git a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
index 8ccd2b5..5cb65d3 100644 (file)
--- a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
+++ b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
@@ -4238,7 +4238,7 @@ emit_vs_output_declarations(struct svga_shader_emitter_v10 *emit)
  */
 static unsigned
 output_writemask_for_stream(unsigned stream, uint8_t output_streams,
-                                 uint8_t output_usagemask)
+                            uint8_t output_usagemask)
 {
    unsigned i;
    unsigned writemask = 0;