Mesa (main): draw: asst. clean-up in draw_pipe.c
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jun 17 00:08:57 UTC 2022
Module: Mesa
Branch: main
Commit: 49a115e86c596d494b113aaedb14c129a7b726a3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=49a115e86c596d494b113aaedb14c129a7b726a3
Author: Brian Paul <brianp at vmware.com>
Date: Fri Jun 10 11:38:46 2022 -0600
draw: asst. clean-up in draw_pipe.c
Signed-off-by: Brian Paul <brianp at vmware.com>
Acked-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17064>
---
src/gallium/auxiliary/draw/draw_pipe.c | 179 +++++++++++++++++----------------
1 file changed, 91 insertions(+), 88 deletions(-)
diff --git a/src/gallium/auxiliary/draw/draw_pipe.c b/src/gallium/auxiliary/draw/draw_pipe.c
index 4339a605a08..d2192e6fce6 100644
--- a/src/gallium/auxiliary/draw/draw_pipe.c
+++ b/src/gallium/auxiliary/draw/draw_pipe.c
@@ -1,8 +1,8 @@
/**************************************************************************
- *
+ *
* Copyright 2007 VMware, Inc.
* All Rights Reserved.
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -10,11 +10,11 @@
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
@@ -22,7 +22,7 @@
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
**************************************************************************/
/*
@@ -36,21 +36,21 @@
#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 );
- draw->pipeline.wide_point = draw_wide_point_stage( draw );
- draw->pipeline.stipple = draw_stipple_stage( draw );
- draw->pipeline.unfilled = draw_unfilled_stage( draw );
- draw->pipeline.twoside = draw_twoside_stage( draw );
- draw->pipeline.offset = draw_offset_stage( draw );
- draw->pipeline.clip = draw_clip_stage( draw );
- draw->pipeline.flatshade = draw_flatshade_stage( draw );
- draw->pipeline.cull = draw_cull_stage( draw );
- draw->pipeline.user_cull = draw_user_cull_stage( draw );
- draw->pipeline.validate = draw_validate_stage( draw );
+ draw->pipeline.wide_line = draw_wide_line_stage(draw);
+ draw->pipeline.wide_point = draw_wide_point_stage(draw);
+ draw->pipeline.stipple = draw_stipple_stage(draw);
+ draw->pipeline.unfilled = draw_unfilled_stage(draw);
+ draw->pipeline.twoside = draw_twoside_stage(draw);
+ draw->pipeline.offset = draw_offset_stage(draw);
+ draw->pipeline.clip = draw_clip_stage(draw);
+ draw->pipeline.flatshade = draw_flatshade_stage(draw);
+ draw->pipeline.cull = draw_cull_stage(draw);
+ draw->pipeline.user_cull = draw_user_cull_stage(draw);
+ draw->pipeline.validate = draw_validate_stage(draw);
draw->pipeline.first = draw->pipeline.validate;
if (!draw->pipeline.wide_line ||
@@ -77,55 +77,56 @@ 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 );
+ draw->pipeline.wide_line->destroy(draw->pipeline.wide_line);
if (draw->pipeline.wide_point)
- draw->pipeline.wide_point->destroy( draw->pipeline.wide_point );
+ draw->pipeline.wide_point->destroy(draw->pipeline.wide_point);
if (draw->pipeline.stipple)
- draw->pipeline.stipple->destroy( draw->pipeline.stipple );
+ draw->pipeline.stipple->destroy(draw->pipeline.stipple);
if (draw->pipeline.unfilled)
- draw->pipeline.unfilled->destroy( draw->pipeline.unfilled );
+ draw->pipeline.unfilled->destroy(draw->pipeline.unfilled);
if (draw->pipeline.twoside)
- draw->pipeline.twoside->destroy( draw->pipeline.twoside );
+ draw->pipeline.twoside->destroy(draw->pipeline.twoside);
if (draw->pipeline.offset)
- draw->pipeline.offset->destroy( draw->pipeline.offset );
+ draw->pipeline.offset->destroy(draw->pipeline.offset);
if (draw->pipeline.clip)
- draw->pipeline.clip->destroy( draw->pipeline.clip );
+ draw->pipeline.clip->destroy(draw->pipeline.clip);
if (draw->pipeline.flatshade)
- draw->pipeline.flatshade->destroy( draw->pipeline.flatshade );
+ draw->pipeline.flatshade->destroy(draw->pipeline.flatshade);
if (draw->pipeline.cull)
- draw->pipeline.cull->destroy( draw->pipeline.cull );
+ draw->pipeline.cull->destroy(draw->pipeline.cull);
if (draw->pipeline.user_cull)
- draw->pipeline.user_cull->destroy( draw->pipeline.user_cull );
+ draw->pipeline.user_cull->destroy(draw->pipeline.user_cull);
if (draw->pipeline.validate)
- draw->pipeline.validate->destroy( draw->pipeline.validate );
+ draw->pipeline.validate->destroy(draw->pipeline.validate);
if (draw->pipeline.aaline)
- draw->pipeline.aaline->destroy( draw->pipeline.aaline );
+ draw->pipeline.aaline->destroy(draw->pipeline.aaline);
if (draw->pipeline.aapoint)
- draw->pipeline.aapoint->destroy( draw->pipeline.aapoint );
+ draw->pipeline.aapoint->destroy(draw->pipeline.aapoint);
if (draw->pipeline.pstipple)
- draw->pipeline.pstipple->destroy( draw->pipeline.pstipple );
+ draw->pipeline.pstipple->destroy(draw->pipeline.pstipple);
if (draw->pipeline.rasterize)
- draw->pipeline.rasterize->destroy( draw->pipeline.rasterize );
+ draw->pipeline.rasterize->destroy(draw->pipeline.rasterize);
}
-
/**
* Build primitive to render a point with vertex at v0.
*/
-static void do_point( struct draw_context *draw,
- const char *v0 )
+static void
+do_point(struct draw_context *draw,
+ const char *v0)
{
struct prim_header prim;
-
+
prim.flags = 0;
prim.pad = 0;
prim.v[0] = (struct vertex_header *)v0;
- draw->pipeline.first->point( draw->pipeline.first, &prim );
+ draw->pipeline.first->point(draw->pipeline.first, &prim);
}
@@ -133,19 +134,20 @@ 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,
- ushort flags,
- const char *v0,
- const char *v1 )
+static void
+do_line(struct draw_context *draw,
+ ushort flags,
+ const char *v0,
+ const char *v1)
{
struct prim_header prim;
-
+
prim.flags = flags;
prim.pad = 0;
prim.v[0] = (struct vertex_header *)v0;
prim.v[1] = (struct vertex_header *)v1;
- draw->pipeline.first->line( draw->pipeline.first, &prim );
+ draw->pipeline.first->line(draw->pipeline.first, &prim);
}
@@ -153,21 +155,22 @@ 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,
- ushort flags,
- char *v0,
- char *v1,
- char *v2 )
+static void
+do_triangle(struct draw_context *draw,
+ ushort flags,
+ char *v0,
+ char *v1,
+ char *v2)
{
struct prim_header prim;
-
+
prim.v[0] = (struct vertex_header *)v0;
prim.v[1] = (struct vertex_header *)v1;
prim.v[2] = (struct vertex_header *)v2;
prim.flags = flags;
prim.pad = 0;
- draw->pipeline.first->tri( draw->pipeline.first, &prim );
+ draw->pipeline.first->tri(draw->pipeline.first, &prim);
}
@@ -176,26 +179,26 @@ static void do_triangle( struct draw_context *draw,
* This code uses vertex indexes / elements.
*/
-#define TRIANGLE(flags,i0,i1,i2) \
- do { \
- do_triangle( draw, \
- flags, \
- verts + stride * (i0), \
- verts + stride * (i1), \
- verts + stride * (i2) ); \
+#define TRIANGLE(flags,i0,i1,i2) \
+ do { \
+ do_triangle(draw, \
+ flags, \
+ verts + stride * (i0), \
+ verts + stride * (i1), \
+ verts + stride * (i2)); \
} while (0)
#define LINE(flags,i0,i1) \
do { \
- do_line( draw, \
- flags, \
- verts + stride * (i0), \
- verts + stride * (i1) ); \
+ do_line(draw, \
+ flags, \
+ verts + stride * (i0), \
+ verts + stride * (i1)); \
} while (0)
-#define POINT(i0) \
- do { \
- do_point( draw, verts + stride * (i0) ); \
+#define POINT(i0) \
+ do { \
+ do_point(draw, verts + stride * (i0)); \
} while (0)
#define GET_ELT(idx) (MIN2(elts[idx], max_index))
@@ -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,
- const struct draw_vertex_info *vert_info,
- const struct draw_prim_info *prim_info)
+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;
@@ -283,18 +285,18 @@ void draw_pipeline_run( struct draw_context *draw,
*/
#define TRIANGLE(flags,i0,i1,i2) \
- do_triangle( draw, flags, \
+ do_triangle(draw, flags, \
verts + stride * (i0), \
verts + stride * (i1), \
- verts + stride * (i2) )
+ verts + stride * (i2))
#define LINE(flags,i0,i1) \
- do_line( draw, flags, \
+ do_line(draw, flags, \
verts + stride * (i0), \
- verts + stride * (i1) )
+ verts + stride * (i1))
#define POINT(i0) \
- do_point( draw, verts + stride * (i0) )
+ do_point(draw, verts + stride * (i0))
#define GET_ELT(idx) (idx)
@@ -314,16 +316,16 @@ void draw_pipeline_run( struct draw_context *draw,
/*
* For drawing non-indexed primitives.
*/
-void draw_pipeline_run_linear( struct draw_context *draw,
- const struct draw_vertex_info *vert_info,
- const struct draw_prim_info *prim_info)
+void
+draw_pipeline_run_linear(struct draw_context *draw,
+ const struct draw_vertex_info *vert_info,
+ const struct draw_prim_info *prim_info)
{
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++) {
unsigned count = prim_info->primitive_lengths[i];
char *verts = ((char*)vert_info->verts) +
(start * vert_info->stride);
@@ -347,10 +349,11 @@ void draw_pipeline_run_linear( struct draw_context *draw,
}
-void draw_pipeline_flush( struct draw_context *draw,
- unsigned flags )
+void
+draw_pipeline_flush(struct draw_context *draw,
+ unsigned flags)
{
- draw->pipeline.first->flush( draw->pipeline.first, flags );
+ draw->pipeline.first->flush(draw->pipeline.first, flags);
if (flags & DRAW_FLUSH_STATE_CHANGE)
draw->pipeline.first = draw->pipeline.validate;
}
More information about the mesa-commit
mailing list