fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

draw: asst. clean-ups in draw_pipe_util.c

Browse source 
Signed-off-by: Brian Paul <brianp@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19024>
This commit is contained in:
Brian Paul 2022-10-05 21:05:08 -06:00 • committed by Marge Bot
parent 8a3b365b92
commit 0a31e24d22
1 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/gallium/auxiliary/draw/draw_pipe_util.c
View file

@ -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.
*
*
**************************************************************************/
/*
@ -42,22 +42,20 @@ draw_pipe_passthrough_point(struct draw_stage *stage, struct prim_header *header
stage->next->point(stage->next, header);
}
void
draw_pipe_passthrough_line(struct draw_stage *stage, struct prim_header *header)
{
stage->next->line(stage->next, header);
}
void
draw_pipe_passthrough_tri(struct draw_stage *stage, struct prim_header *header)
{
stage->next->tri(stage->next, header);
}
/* This is only used for temporary verts.
*/
#define MAX_VERTEX_SIZE ((2 + PIPE_MAX_SHADER_OUTPUTS) * 4 * sizeof(float))
@ -66,28 +64,27 @@ draw_pipe_passthrough_tri(struct draw_stage *stage, struct prim_header *header)
/**
* Allocate space for temporary post-transform vertices, such as for clipping.
*/
boolean draw_alloc_temp_verts( struct draw_stage *stage, unsigned nr )
boolean
draw_alloc_temp_verts(struct draw_stage *stage, unsigned nr)
{
assert(!stage->tmp);
stage->tmp = NULL;
stage->nr_tmps = nr;
if (nr != 0)
{
unsigned i;
ubyte *store = (ubyte *) MALLOC( MAX_VERTEX_SIZE * nr +
DRAW_EXTRA_VERTICES_PADDING );
if (nr != 0) {
ubyte *store = (ubyte *) MALLOC(MAX_VERTEX_SIZE * nr +
DRAW_EXTRA_VERTICES_PADDING);
if (!store)
return FALSE;
stage->tmp = (struct vertex_header **) MALLOC( sizeof(struct vertex_header *) * nr );
stage->tmp = (struct vertex_header **) MALLOC(sizeof(struct vertex_header *) * nr);
if (stage->tmp == NULL) {
FREE(store);
return FALSE;
}
for (i = 0; i < nr; i++)
for (unsigned i = 0; i < nr; i++)
stage->tmp[i] = (struct vertex_header *)(store + i * MAX_VERTEX_SIZE);
}
@ -95,11 +92,12 @@ boolean draw_alloc_temp_verts( struct draw_stage *stage, unsigned nr )
}
void draw_free_temp_verts( struct draw_stage *stage )
void
draw_free_temp_verts(struct draw_stage *stage)
{
if (stage->tmp) {
FREE( stage->tmp[0] );
FREE( stage->tmp );
FREE(stage->tmp[0]);
FREE(stage->tmp);
stage->tmp = NULL;
}
}
@ -109,26 +107,23 @@ void draw_free_temp_verts( struct draw_stage *stage )
*
* Called only from draw_pipe_vbuf.c
*/
void draw_reset_vertex_ids(struct draw_context *draw)
void
draw_reset_vertex_ids(struct draw_context *draw)
{
struct draw_stage *stage = draw->pipeline.first;
while (stage) {
unsigned i;
for (i = 0; i < stage->nr_tmps; i++)
stage->tmp[i]->vertex_id = UNDEFINED_VERTEX_ID;
while (stage) {
for (unsigned i = 0; i < stage->nr_tmps; i++)
stage->tmp[i]->vertex_id = UNDEFINED_VERTEX_ID;
stage = stage->next;
}
if (draw->pipeline.verts)
{
unsigned i;
if (draw->pipeline.verts) {
char *verts = draw->pipeline.verts;
unsigned stride = draw->pipeline.vertex_stride;
for (i = 0; i < draw->pipeline.vertex_count; i++) {
for (unsigned i = 0; i < draw->pipeline.vertex_count; i++) {
((struct vertex_header *)verts)->vertex_id = UNDEFINED_VERTEX_ID;
verts += stride;
}