From fcdbf7112c4d4e4cc43dd0ab456bd1c9ed81de58 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 10 Jun 2022 11:39:38 -0600 Subject: [PATCH] draw: asst. clean-up in draw_pt_fetch_shader_emit.c Signed-off-by: Brian Paul Acked-by: Dave Airlie Reviewed-by: Roland Scheidegger Part-of: --- .../auxiliary/draw/draw_pt_fetch_shade_emit.c | 116 ++++++++---------- 1 file changed, 50 insertions(+), 66 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c index 2a4f61949da..5efbee7e83e 100644 --- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c +++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c @@ -75,7 +75,6 @@ fse_prepare(struct draw_pt_middle_end *middle, struct draw_context *draw = fse->draw; unsigned num_vs_inputs = draw->vs.vertex_shader->info.num_inputs; const struct vertex_info *vinfo; - unsigned i; unsigned nr_vbs = 0; /* Can't support geometry shader on this path. @@ -102,7 +101,7 @@ fse_prepare(struct draw_pt_middle_end *middle, memset(fse->key.element, 0, fse->key.nr_elements * sizeof(fse->key.element[0])); - for (i = 0; i < num_vs_inputs; i++) { + for (unsigned i = 0; i < num_vs_inputs; i++) { const struct pipe_vertex_element *src = &draw->pt.vertex_element[i]; fse->key.element[i].in.format = src->src_format; @@ -114,17 +113,18 @@ fse_prepare(struct draw_pt_middle_end *middle, nr_vbs = MAX2(nr_vbs, src->vertex_buffer_index + 1); } - for (i = 0; i < 5 && i < nr_vbs; i++) { + for (unsigned i = 0; i < 5 && i < nr_vbs; i++) { if (draw->pt.vertex_buffer[i].stride == 0) fse->key.const_vbuffers |= (1<key.const_vbuffers); + if (0) debug_printf("%s: lookup const_vbuffers: %x\n", + __FUNCTION__, fse->key.const_vbuffers); { unsigned dst_offset = 0; - for (i = 0; i < vinfo->num_attribs; i++) { + for (unsigned i = 0; i < vinfo->num_attribs; i++) { unsigned emit_sz = draw_translate_vinfo_size(vinfo->attrib[i].emit); /* doesn't handle EMIT_OMIT */ @@ -143,8 +143,7 @@ fse_prepare(struct draw_pt_middle_end *middle, } } - fse->active = draw_vs_lookup_variant( draw->vs.vertex_shader, - &fse->key ); + fse->active = draw_vs_lookup_variant(draw->vs.vertex_shader, &fse->key); if (!fse->active) { assert(0); @@ -156,13 +155,13 @@ fse_prepare(struct draw_pt_middle_end *middle, /* Now set buffer pointers: */ - for (i = 0; i < draw->pt.nr_vertex_buffers; i++) { - fse->active->set_buffer( fse->active, - i, - ((const ubyte *) draw->pt.user.vbuffer[i].map + - draw->pt.vertex_buffer[i].buffer_offset), + for (unsigned i = 0; i < draw->pt.nr_vertex_buffers; i++) { + fse->active->set_buffer(fse->active, + i, + ((const ubyte *) draw->pt.user.vbuffer[i].map + + draw->pt.vertex_buffer[i].buffer_offset), draw->pt.vertex_buffer[i].stride, - draw->pt.max_index ); + draw->pt.max_index); } *max_vertices = (draw->render->max_vertex_buffer_bytes / @@ -197,14 +196,14 @@ fse_run_linear(struct draw_pt_middle_end *middle, /* XXX: need to flush to get prim_vbuf.c to release its allocation?? */ - draw_do_flush( draw, DRAW_FLUSH_BACKEND ); + draw_do_flush(draw, DRAW_FLUSH_BACKEND); - if (!draw->render->allocate_vertices( draw->render, - (ushort)fse->key.output_stride, - (ushort)count )) + if (!draw->render->allocate_vertices(draw->render, + (ushort) fse->key.output_stride, + (ushort) count)) goto fail; - hw_verts = draw->render->map_vertices( draw->render ); + hw_verts = draw->render->map_vertices(draw->render); if (!hw_verts) goto fail; @@ -212,32 +211,29 @@ fse_run_linear(struct draw_pt_middle_end *middle, * Clipping is done elsewhere -- either by the API or on hardware, * or for some other reason not required... */ - fse->active->run_linear( fse->active, - start, count, - hw_verts ); + fse->active->run_linear(fse->active, start, count, hw_verts); if (0) { - unsigned i; - for (i = 0; i < count; i++) { - debug_printf("\n\n%s vertex %d: (stride %d, offset %d)\n", __FUNCTION__, i, + for (unsigned i = 0; i < count; i++) { + debug_printf("\n\n%s vertex %d: (stride %d, offset %d)\n", + __FUNCTION__, i, fse->key.output_stride, fse->key.output_stride * i); - draw_dump_emitted_vertex( fse->vinfo, - (const uint8_t *)hw_verts + fse->key.output_stride * i ); + draw_dump_emitted_vertex(fse->vinfo, + (const uint8_t *) hw_verts + + fse->key.output_stride * i); } } - draw->render->unmap_vertices( draw->render, 0, (ushort)(count - 1) ); + draw->render->unmap_vertices(draw->render, 0, (ushort) (count - 1)); /* Draw arrays path to avoid re-emitting index list again and * again. */ - draw->render->draw_arrays( draw->render, - 0, - count ); + draw->render->draw_arrays(draw->render, 0, count); - draw->render->release_vertices( draw->render ); + draw->render->release_vertices(draw->render); return; @@ -253,7 +249,7 @@ fse_run(struct draw_pt_middle_end *middle, unsigned fetch_count, const ushort *draw_elts, unsigned draw_count, - unsigned prim_flags ) + unsigned prim_flags) { struct fetch_shade_emit *fse = (struct fetch_shade_emit *)middle; struct draw_context *draw = fse->draw; @@ -261,41 +257,35 @@ fse_run(struct draw_pt_middle_end *middle, /* XXX: need to flush to get prim_vbuf.c to release its allocation?? */ - draw_do_flush( draw, DRAW_FLUSH_BACKEND ); + draw_do_flush(draw, DRAW_FLUSH_BACKEND); - if (!draw->render->allocate_vertices( draw->render, - (ushort)fse->key.output_stride, - (ushort)fetch_count )) + if (!draw->render->allocate_vertices(draw->render, + (ushort) fse->key.output_stride, + (ushort) fetch_count)) goto fail; - hw_verts = draw->render->map_vertices( draw->render ); + hw_verts = draw->render->map_vertices(draw->render); if (!hw_verts) goto fail; /* Single routine to fetch vertices, run shader and emit HW verts. */ - fse->active->run_elts( fse->active, - fetch_elts, - fetch_count, - hw_verts ); + fse->active->run_elts(fse->active, fetch_elts, fetch_count, hw_verts); if (0) { - unsigned i; - for (i = 0; i < fetch_count; i++) { + for (unsigned i = 0; i < fetch_count; i++) { debug_printf("\n\n%s vertex %d:\n", __FUNCTION__, i); - draw_dump_emitted_vertex( fse->vinfo, - (const uint8_t *)hw_verts + - fse->key.output_stride * i ); + draw_dump_emitted_vertex(fse->vinfo, + (const uint8_t *)hw_verts + + fse->key.output_stride * i); } } - draw->render->unmap_vertices( draw->render, 0, (ushort)(fetch_count - 1) ); + draw->render->unmap_vertices(draw->render, 0, (ushort)(fetch_count - 1)); - draw->render->draw_elements( draw->render, - draw_elts, - draw_count ); + draw->render->draw_elements(draw->render, draw_elts, draw_count); - draw->render->release_vertices( draw->render ); + draw->render->release_vertices(draw->render); return; fail: @@ -304,7 +294,6 @@ fail: } - static boolean fse_run_linear_elts(struct draw_pt_middle_end *middle, unsigned start, @@ -319,14 +308,14 @@ fse_run_linear_elts(struct draw_pt_middle_end *middle, /* XXX: need to flush to get prim_vbuf.c to release its allocation?? */ - draw_do_flush( draw, DRAW_FLUSH_BACKEND ); + draw_do_flush(draw, DRAW_FLUSH_BACKEND); - if (!draw->render->allocate_vertices( draw->render, - (ushort)fse->key.output_stride, - (ushort)count )) + if (!draw->render->allocate_vertices(draw->render, + (ushort) fse->key.output_stride, + (ushort) count)) return FALSE; - hw_verts = draw->render->map_vertices( draw->render ); + hw_verts = draw->render->map_vertices(draw->render); if (!hw_verts) return FALSE; @@ -334,23 +323,18 @@ fse_run_linear_elts(struct draw_pt_middle_end *middle, * Clipping is done elsewhere -- either by the API or on hardware, * or for some other reason not required... */ - fse->active->run_linear( fse->active, - start, count, - hw_verts ); + fse->active->run_linear(fse->active, start, count, hw_verts); - draw->render->draw_elements( draw->render, - draw_elts, - draw_count ); + draw->render->draw_elements(draw->render, draw_elts, draw_count); - draw->render->unmap_vertices( draw->render, 0, (ushort)(count - 1) ); + draw->render->unmap_vertices(draw->render, 0, (ushort)(count - 1)); - draw->render->release_vertices( draw->render ); + draw->render->release_vertices(draw->render); return TRUE; } - static void fse_finish(struct draw_pt_middle_end *middle) {