X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2Fdraw%2Fdraw_pt_fetch_emit.c;h=c7b224a88f70257f704d9627dc98e4fec5447922;hb=f76ca91ae07040fe661ecb215b2e6bf43dc16283;hp=97d66e5f11dda7f93c0e46a3dbb1c4a3e4fad08b;hpb=488dd2c1912132fe7ee5e81b05fb64ba62a46098;p=mesa.git diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c b/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c index 97d66e5f11d..c7b224a88f7 100644 --- a/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c +++ b/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c @@ -1,8 +1,8 @@ /************************************************************************** - * - * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * + * 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,24 +10,24 @@ * 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. - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR * 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. - * + * **************************************************************************/ /* * Authors: - * Keith Whitwell + * Keith Whitwell */ #include "util/u_memory.h" @@ -40,15 +40,15 @@ #include "translate/translate.h" #include "translate/translate_cache.h" -/* The simplest 'middle end' in the new vertex code. - * +/* The simplest 'middle end' in the new vertex code. + * * The responsibilities of a middle end are to: * - perform vertex fetch using * - draw vertex element/buffer state * - a list of fetch indices we received as an input * - run the vertex shader - * - cliptest, - * - clip coord calculation + * - cliptest, + * - clip coord calculation * - viewport transformation * - if necessary, run the primitive pipeline, passing it: * - a linear array of vertex_header vertices constructed here @@ -75,7 +75,7 @@ struct fetch_emit_middle_end { struct draw_pt_middle_end base; struct draw_context *draw; - + struct translate *translate; const struct vertex_info *vinfo; @@ -87,8 +87,6 @@ struct fetch_emit_middle_end { }; - - static void fetch_emit_prepare( struct draw_pt_middle_end *middle, unsigned prim, unsigned opt, @@ -99,20 +97,15 @@ static void fetch_emit_prepare( struct draw_pt_middle_end *middle, const struct vertex_info *vinfo; unsigned i, dst_offset; struct translate_key key; - - unsigned gs_out_prim = (draw->gs.geometry_shader ? + unsigned gs_out_prim = (draw->gs.geometry_shader ? draw->gs.geometry_shader->output_primitive : prim); - - draw->render->set_primitive(draw->render, gs_out_prim); - + /* Must do this after set_primitive() above: */ vinfo = feme->vinfo = draw->render->get_vertex_info(draw->render); - - /* Transform from API vertices to HW vertices, skipping the * pipeline_vertex intermediate step. @@ -148,7 +141,7 @@ static void fetch_emit_prepare( struct draw_pt_middle_end *middle, key.element[i].instance_divisor = src->instance_divisor; key.element[i].output_format = output_format; key.element[i].output_offset = dst_offset; - + dst_offset += emit_sz; } @@ -158,37 +151,40 @@ static void fetch_emit_prepare( struct draw_pt_middle_end *middle, /* Don't bother with caching at this stage: */ if (!feme->translate || - translate_key_compare(&feme->translate->key, &key) != 0) + translate_key_compare(&feme->translate->key, &key) != 0) { translate_key_sanitize(&key); feme->translate = translate_cache_find(feme->cache, &key); - - feme->translate->set_buffer(feme->translate, - draw->pt.nr_vertex_buffers, + feme->translate->set_buffer(feme->translate, + draw->pt.nr_vertex_buffers, &feme->point_size, 0, ~0); } - + feme->point_size = draw->rasterizer->point_size; for (i = 0; i < draw->pt.nr_vertex_buffers; i++) { - feme->translate->set_buffer(feme->translate, - i, - ((char *)draw->pt.user.vbuffer[i] + + feme->translate->set_buffer(feme->translate, + i, + ((char *)draw->pt.user.vbuffer[i].map + draw->pt.vertex_buffer[i].buffer_offset), draw->pt.vertex_buffer[i].stride, draw->pt.max_index); } - *max_vertices = (draw->render->max_vertex_buffer_bytes / + *max_vertices = (draw->render->max_vertex_buffer_bytes / (vinfo->size * 4)); } - +static void +fetch_emit_bind_parameters(struct draw_pt_middle_end *middle) +{ + /* No-op? */ +} static void fetch_emit_run( struct draw_pt_middle_end *middle, @@ -201,8 +197,8 @@ static void fetch_emit_run( struct draw_pt_middle_end *middle, struct fetch_emit_middle_end *feme = (struct fetch_emit_middle_end *)middle; struct draw_context *draw = feme->draw; void *hw_verts; - - /* XXX: need to flush to get prim_vbuf.c to release its allocation?? + + /* XXX: need to flush to get prim_vbuf.c to release its allocation?? */ draw_do_flush( draw, DRAW_FLUSH_BACKEND ); @@ -212,16 +208,16 @@ static void fetch_emit_run( struct draw_pt_middle_end *middle, hw_verts = draw->render->map_vertices( draw->render ); if (!hw_verts) { - assert(0); + debug_warn_once("vertex buffer allocation failed (out of memory?)"); return; } - - + /* Single routine to fetch vertices and emit HW verts. */ - feme->translate->run_elts( feme->translate, + feme->translate->run_elts( feme->translate, fetch_elts, fetch_count, + draw->start_instance, draw->instance_id, hw_verts ); @@ -229,23 +225,23 @@ static void fetch_emit_run( struct draw_pt_middle_end *middle, unsigned i; for (i = 0; i < fetch_count; i++) { debug_printf("\n\nvertex %d:\n", i); - draw_dump_emitted_vertex( feme->vinfo, + draw_dump_emitted_vertex( feme->vinfo, (const uint8_t *)hw_verts + feme->vinfo->size * 4 * i ); } } - draw->render->unmap_vertices( draw->render, - 0, + draw->render->unmap_vertices( draw->render, + 0, (ushort)(fetch_count - 1) ); /* XXX: Draw arrays path to avoid re-emitting index list again and * again. */ - draw->render->draw_elements( draw->render, - draw_elts, + draw->render->draw_elements( draw->render, + draw_elts, draw_count ); - /* Done -- that was easy, wasn't it: + /* Done -- that was easy, wasn't it: */ draw->render->release_vertices( draw->render ); @@ -267,11 +263,11 @@ static void fetch_emit_run_linear( struct draw_pt_middle_end *middle, if (!draw->render->allocate_vertices( draw->render, (ushort)feme->translate->key.output_stride, - (ushort)count )) + (ushort)count )) goto fail; hw_verts = draw->render->map_vertices( draw->render ); - if (!hw_verts) + if (!hw_verts) goto fail; /* Single routine to fetch vertices and emit HW verts. @@ -279,6 +275,7 @@ static void fetch_emit_run_linear( struct draw_pt_middle_end *middle, feme->translate->run( feme->translate, start, count, + draw->start_instance, draw->instance_id, hw_verts ); @@ -304,7 +301,7 @@ static void fetch_emit_run_linear( struct draw_pt_middle_end *middle, return; fail: - assert(0); + debug_warn_once("allocate or map of vertex buffer failed (out of memory?)"); return; } @@ -330,7 +327,7 @@ static boolean fetch_emit_run_linear_elts( struct draw_pt_middle_end *middle, return FALSE; hw_verts = draw->render->map_vertices( draw->render ); - if (!hw_verts) + if (!hw_verts) return FALSE; /* Single routine to fetch vertices and emit HW verts. @@ -338,6 +335,7 @@ static boolean fetch_emit_run_linear_elts( struct draw_pt_middle_end *middle, feme->translate->run( feme->translate, start, count, + draw->start_instance, draw->instance_id, hw_verts ); @@ -346,8 +344,8 @@ static boolean fetch_emit_run_linear_elts( struct draw_pt_middle_end *middle, /* XXX: Draw arrays path to avoid re-emitting index list again and * again. */ - draw->render->draw_elements( draw->render, - draw_elts, + draw->render->draw_elements( draw->render, + draw_elts, draw_count ); /* Done -- that was easy, wasn't it: @@ -358,13 +356,12 @@ static boolean fetch_emit_run_linear_elts( struct draw_pt_middle_end *middle, } - - static void fetch_emit_finish( struct draw_pt_middle_end *middle ) { /* nothing to do */ } + static void fetch_emit_destroy( struct draw_pt_middle_end *middle ) { struct fetch_emit_middle_end *feme = (struct fetch_emit_middle_end *)middle; @@ -379,7 +376,7 @@ static void fetch_emit_destroy( struct draw_pt_middle_end *middle ) struct draw_pt_middle_end *draw_pt_fetch_emit( struct draw_context *draw ) { struct fetch_emit_middle_end *fetch_emit = CALLOC_STRUCT( fetch_emit_middle_end ); - if (fetch_emit == NULL) + if (!fetch_emit) return NULL; fetch_emit->cache = translate_cache_create(); @@ -389,6 +386,7 @@ struct draw_pt_middle_end *draw_pt_fetch_emit( struct draw_context *draw ) } fetch_emit->base.prepare = fetch_emit_prepare; + fetch_emit->base.bind_parameters = fetch_emit_bind_parameters; fetch_emit->base.run = fetch_emit_run; fetch_emit->base.run_linear = fetch_emit_run_linear; fetch_emit->base.run_linear_elts = fetch_emit_run_linear_elts; @@ -396,7 +394,7 @@ struct draw_pt_middle_end *draw_pt_fetch_emit( struct draw_context *draw ) fetch_emit->base.destroy = fetch_emit_destroy; fetch_emit->draw = draw; - + return &fetch_emit->base; }