OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

draw: asst. clean-up in draw_pipe.c

Browse Source 
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
1 changed files with 91 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
src/gallium/auxiliary/draw/draw_pipe.c
View File

@@ -1,8 +1,8 @@
/************************************************************************** /**************************************************************************
* *
* Copyright 2007 VMware, Inc. * Copyright 2007 VMware, Inc.
* All Rights Reserved. * All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the * copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including * "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 * 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 * permit persons to whom the Software is furnished to do so, subject to
* the following conditions: * the following conditions:
* *
* The above copyright notice and this permission notice (including the * The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions * next paragraph) shall be included in all copies or substantial portions
* of the Software. * of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. * 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, * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
**************************************************************************/ **************************************************************************/
/* /*
@@ -36,21 +36,21 @@
#include "util/u_math.h" #include "util/u_math.h"
boolean
boolean draw_pipeline_init( struct draw_context *draw ) draw_pipeline_init(struct draw_context *draw)
{ {
/* create pipeline stages */ /* create pipeline stages */
draw->pipeline.wide_line = draw_wide_line_stage( draw ); draw->pipeline.wide_line = draw_wide_line_stage(draw);
draw->pipeline.wide_point = draw_wide_point_stage( draw ); draw->pipeline.wide_point = draw_wide_point_stage(draw);
draw->pipeline.stipple = draw_stipple_stage( draw ); draw->pipeline.stipple = draw_stipple_stage(draw);
draw->pipeline.unfilled = draw_unfilled_stage( draw ); draw->pipeline.unfilled = draw_unfilled_stage(draw);
draw->pipeline.twoside = draw_twoside_stage( draw ); draw->pipeline.twoside = draw_twoside_stage(draw);
draw->pipeline.offset = draw_offset_stage( draw ); draw->pipeline.offset = draw_offset_stage(draw);
draw->pipeline.clip = draw_clip_stage( draw ); draw->pipeline.clip = draw_clip_stage(draw);
draw->pipeline.flatshade = draw_flatshade_stage( draw ); draw->pipeline.flatshade = draw_flatshade_stage(draw);
draw->pipeline.cull = draw_cull_stage( draw ); draw->pipeline.cull = draw_cull_stage(draw);
draw->pipeline.user_cull = draw_user_cull_stage( draw ); draw->pipeline.user_cull = draw_user_cull_stage(draw);
draw->pipeline.validate = draw_validate_stage( draw ); draw->pipeline.validate = draw_validate_stage(draw);
draw->pipeline.first = draw->pipeline.validate; draw->pipeline.first = draw->pipeline.validate;
if (!draw->pipeline.wide_line || 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) 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) 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) if (draw->pipeline.stipple)
draw->pipeline.stipple->destroy( draw->pipeline.stipple ); draw->pipeline.stipple->destroy(draw->pipeline.stipple);
if (draw->pipeline.unfilled) if (draw->pipeline.unfilled)
draw->pipeline.unfilled->destroy( draw->pipeline.unfilled ); draw->pipeline.unfilled->destroy(draw->pipeline.unfilled);
if (draw->pipeline.twoside) if (draw->pipeline.twoside)
draw->pipeline.twoside->destroy( draw->pipeline.twoside ); draw->pipeline.twoside->destroy(draw->pipeline.twoside);
if (draw->pipeline.offset) if (draw->pipeline.offset)
draw->pipeline.offset->destroy( draw->pipeline.offset ); draw->pipeline.offset->destroy(draw->pipeline.offset);
if (draw->pipeline.clip) if (draw->pipeline.clip)
draw->pipeline.clip->destroy( draw->pipeline.clip ); draw->pipeline.clip->destroy(draw->pipeline.clip);
if (draw->pipeline.flatshade) if (draw->pipeline.flatshade)
draw->pipeline.flatshade->destroy( draw->pipeline.flatshade ); draw->pipeline.flatshade->destroy(draw->pipeline.flatshade);
if (draw->pipeline.cull) if (draw->pipeline.cull)
draw->pipeline.cull->destroy( draw->pipeline.cull ); draw->pipeline.cull->destroy(draw->pipeline.cull);
if (draw->pipeline.user_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) if (draw->pipeline.validate)
draw->pipeline.validate->destroy( draw->pipeline.validate ); draw->pipeline.validate->destroy(draw->pipeline.validate);
if (draw->pipeline.aaline) if (draw->pipeline.aaline)
draw->pipeline.aaline->destroy( draw->pipeline.aaline ); draw->pipeline.aaline->destroy(draw->pipeline.aaline);
if (draw->pipeline.aapoint) if (draw->pipeline.aapoint)
draw->pipeline.aapoint->destroy( draw->pipeline.aapoint ); draw->pipeline.aapoint->destroy(draw->pipeline.aapoint);
if (draw->pipeline.pstipple) if (draw->pipeline.pstipple)
draw->pipeline.pstipple->destroy( draw->pipeline.pstipple ); draw->pipeline.pstipple->destroy(draw->pipeline.pstipple);
if (draw->pipeline.rasterize) 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. * Build primitive to render a point with vertex at v0.
*/ */
static void do_point( struct draw_context *draw, static void
const char *v0 ) do_point(struct draw_context *draw,
const char *v0)
{ {
struct prim_header prim; struct prim_header prim;
prim.flags = 0; prim.flags = 0;
prim.pad = 0; prim.pad = 0;
prim.v[0] = (struct vertex_header *)v0; 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. * Build primitive to render a line with vertices at v0, v1.
* \param flags bitmask of DRAW_PIPE_EDGE_x, DRAW_PIPE_RESET_STIPPLE * \param flags bitmask of DRAW_PIPE_EDGE_x, DRAW_PIPE_RESET_STIPPLE
*/ */
static void do_line( struct draw_context *draw, static void
ushort flags, do_line(struct draw_context *draw,
const char *v0, ushort flags,
const char *v1 ) const char *v0,
const char *v1)
{ {
struct prim_header prim; struct prim_header prim;
prim.flags = flags; prim.flags = flags;
prim.pad = 0; prim.pad = 0;
prim.v[0] = (struct vertex_header *)v0; prim.v[0] = (struct vertex_header *)v0;
prim.v[1] = (struct vertex_header *)v1; 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. * Build primitive to render a triangle with vertices at v0, v1, v2.
* \param flags bitmask of DRAW_PIPE_EDGE_x, DRAW_PIPE_RESET_STIPPLE * \param flags bitmask of DRAW_PIPE_EDGE_x, DRAW_PIPE_RESET_STIPPLE
*/ */
static void do_triangle( struct draw_context *draw, static void
ushort flags, do_triangle(struct draw_context *draw,
char *v0, ushort flags,
char *v1, char *v0,
char *v2 ) char *v1,
char *v2)
{ {
struct prim_header prim; struct prim_header prim;
prim.v[0] = (struct vertex_header *)v0; prim.v[0] = (struct vertex_header *)v0;
prim.v[1] = (struct vertex_header *)v1; prim.v[1] = (struct vertex_header *)v1;
prim.v[2] = (struct vertex_header *)v2; prim.v[2] = (struct vertex_header *)v2;
prim.flags = flags; prim.flags = flags;
prim.pad = 0; 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. * This code uses vertex indexes / elements.
*/ */
#define TRIANGLE(flags,i0,i1,i2) \ #define TRIANGLE(flags,i0,i1,i2) \
do { \ do { \
do_triangle( draw, \ do_triangle(draw, \
flags, \ flags, \
verts + stride * (i0), \ verts + stride * (i0), \
verts + stride * (i1), \ verts + stride * (i1), \
verts + stride * (i2) ); \ verts + stride * (i2)); \
} while (0) } while (0)
#define LINE(flags,i0,i1) \ #define LINE(flags,i0,i1) \
do { \ do { \
do_line( draw, \ do_line(draw, \
flags, \ flags, \
verts + stride * (i0), \ verts + stride * (i0), \
verts + stride * (i1) ); \ verts + stride * (i1)); \
} while (0) } while (0)
#define POINT(i0) \ #define POINT(i0) \
do { \ do { \
do_point( draw, verts + stride * (i0) ); \ do_point(draw, verts + stride * (i0)); \
} while (0) } while (0)
#define GET_ELT(idx) (MIN2(elts[idx], max_index)) #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 * 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. * draw_vbuf.c code uses when it has to perform a flush.
*/ */
void draw_pipeline_run( struct draw_context *draw, void
const struct draw_vertex_info *vert_info, draw_pipeline_run(struct draw_context *draw,
const struct draw_prim_info *prim_info) 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.verts = (char *)vert_info->verts;
draw->pipeline.vertex_stride = vert_info->stride; draw->pipeline.vertex_stride = vert_info->stride;
draw->pipeline.vertex_count = vert_info->count; draw->pipeline.vertex_count = vert_info->count;
unsigned i, start;
for (start = i = 0; for (start = i = 0;
i < prim_info->primitive_count; 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]; const unsigned count = prim_info->primitive_lengths[i];
#if DEBUG #if DEBUG
/* Warn if one of the element indexes go outside the vertex buffer */ /* 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 */ /* 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]; unsigned int index = prim_info->elts[start + i];
if (index > max_index) if (index > max_index)
max_index = index; max_index = index;
@@ -283,18 +285,18 @@ void draw_pipeline_run( struct draw_context *draw,
*/ */
#define TRIANGLE(flags,i0,i1,i2) \ #define TRIANGLE(flags,i0,i1,i2) \
do_triangle( draw, flags, \ do_triangle(draw, flags, \
verts + stride * (i0), \ verts + stride * (i0), \
verts + stride * (i1), \ verts + stride * (i1), \
verts + stride * (i2) ) verts + stride * (i2))
#define LINE(flags,i0,i1) \ #define LINE(flags,i0,i1) \
do_line( draw, flags, \ do_line(draw, flags, \
verts + stride * (i0), \ verts + stride * (i0), \
verts + stride * (i1) ) verts + stride * (i1))
#define POINT(i0) \ #define POINT(i0) \
do_point( draw, verts + stride * (i0) ) do_point(draw, verts + stride * (i0))
#define GET_ELT(idx) (idx) #define GET_ELT(idx) (idx)
@@ -314,16 +316,16 @@ void draw_pipeline_run( struct draw_context *draw,
/* /*
* For drawing non-indexed primitives. * For drawing non-indexed primitives.
*/ */
void draw_pipeline_run_linear( struct draw_context *draw, void
const struct draw_vertex_info *vert_info, draw_pipeline_run_linear(struct draw_context *draw,
const struct draw_prim_info *prim_info) const struct draw_vertex_info *vert_info,
const struct draw_prim_info *prim_info)
{ {
unsigned i, start; unsigned i, start;
for (start = i = 0; for (start = i = 0;
i < prim_info->primitive_count; 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]; unsigned count = prim_info->primitive_lengths[i];
char *verts = ((char*)vert_info->verts) + char *verts = ((char*)vert_info->verts) +
(start * vert_info->stride); (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, void
unsigned flags ) 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) if (flags & DRAW_FLUSH_STATE_CHANGE)
draw->pipeline.first = draw->pipeline.validate; draw->pipeline.first = draw->pipeline.validate;
} }