draw: asst. clean-up in draw_pipe.c

Signed-off-by: Brian Paul <brianp@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17064>
This commit is contained in:
Brian Paul
2022-06-10 11:38:46 -06:00
committed by Marge Bot
parent 7e1a1e898a
commit 49a115e86c

View File

@@ -36,8 +36,8 @@
#include "util/u_math.h"
boolean draw_pipeline_init( struct draw_context *draw )
boolean
draw_pipeline_init(struct draw_context *draw)
{
/* create pipeline stages */
draw->pipeline.wide_line = draw_wide_line_stage(draw);
@@ -77,7 +77,8 @@ boolean draw_pipeline_init( struct draw_context *draw )
}
void draw_pipeline_destroy( struct draw_context *draw )
void
draw_pipeline_destroy(struct draw_context *draw)
{
if (draw->pipeline.wide_line)
draw->pipeline.wide_line->destroy(draw->pipeline.wide_line);
@@ -112,11 +113,11 @@ void draw_pipeline_destroy( struct draw_context *draw )
}
/**
* Build primitive to render a point with vertex at v0.
*/
static void do_point( struct draw_context *draw,
static void
do_point(struct draw_context *draw,
const char *v0)
{
struct prim_header prim;
@@ -133,7 +134,8 @@ static void do_point( struct draw_context *draw,
* Build primitive to render a line with vertices at v0, v1.
* \param flags bitmask of DRAW_PIPE_EDGE_x, DRAW_PIPE_RESET_STIPPLE
*/
static void do_line( struct draw_context *draw,
static void
do_line(struct draw_context *draw,
ushort flags,
const char *v0,
const char *v1)
@@ -153,7 +155,8 @@ static void do_line( struct draw_context *draw,
* Build primitive to render a triangle with vertices at v0, v1, v2.
* \param flags bitmask of DRAW_PIPE_EDGE_x, DRAW_PIPE_RESET_STIPPLE
*/
static void do_triangle( struct draw_context *draw,
static void
do_triangle(struct draw_context *draw,
ushort flags,
char *v0,
char *v1,
@@ -227,28 +230,27 @@ static void do_triangle( struct draw_context *draw,
* This code provides a callback to reset the vertex id's which the
* draw_vbuf.c code uses when it has to perform a flush.
*/
void draw_pipeline_run( struct draw_context *draw,
void
draw_pipeline_run(struct draw_context *draw,
const struct draw_vertex_info *vert_info,
const struct draw_prim_info *prim_info)
{
unsigned i, start;
draw->pipeline.verts = (char *)vert_info->verts;
draw->pipeline.vertex_stride = vert_info->stride;
draw->pipeline.vertex_count = vert_info->count;
unsigned i, start;
for (start = i = 0;
i < prim_info->primitive_count;
start += prim_info->primitive_lengths[i], i++)
{
start += prim_info->primitive_lengths[i], i++) {
const unsigned count = prim_info->primitive_lengths[i];
#if DEBUG
/* Warn if one of the element indexes go outside the vertex buffer */
{
unsigned max_index = 0x0, i;
unsigned max_index = 0x0;
/* find the largest element index */
for (i = 0; i < count; i++) {
for (unsigned i = 0; i < count; i++) {
unsigned int index = prim_info->elts[start + i];
if (index > max_index)
max_index = index;
@@ -314,7 +316,8 @@ void draw_pipeline_run( struct draw_context *draw,
/*
* For drawing non-indexed primitives.
*/
void draw_pipeline_run_linear( struct draw_context *draw,
void
draw_pipeline_run_linear(struct draw_context *draw,
const struct draw_vertex_info *vert_info,
const struct draw_prim_info *prim_info)
{
@@ -322,8 +325,7 @@ void draw_pipeline_run_linear( struct draw_context *draw,
for (start = i = 0;
i < prim_info->primitive_count;
start += prim_info->primitive_lengths[i], i++)
{
start += prim_info->primitive_lengths[i], i++) {
unsigned count = prim_info->primitive_lengths[i];
char *verts = ((char*)vert_info->verts) +
(start * vert_info->stride);
@@ -347,7 +349,8 @@ void draw_pipeline_run_linear( struct draw_context *draw,
}
void draw_pipeline_flush( struct draw_context *draw,
void
draw_pipeline_flush(struct draw_context *draw,
unsigned flags)
{
draw->pipeline.first->flush(draw->pipeline.first, flags);