X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2Flp_draw_arrays.c;h=d9700cfd6d78a580e381cd3c65f38412d0306fc3;hb=6a8aaf7c00743a5c184960b0e275f319a16a4433;hp=3af5c8d5c55e2bc213959b1177095ffb85e6fcd8;hpb=222d2f2ac2c7d93cbc0643082c78278ad2c8cfce;p=mesa.git diff --git a/src/gallium/drivers/llvmpipe/lp_draw_arrays.c b/src/gallium/drivers/llvmpipe/lp_draw_arrays.c index 3af5c8d5c55..d9700cfd6d7 100644 --- a/src/gallium/drivers/llvmpipe/lp_draw_arrays.c +++ b/src/gallium/drivers/llvmpipe/lp_draw_arrays.c @@ -1,6 +1,6 @@ /************************************************************************** * - * 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 @@ -18,7 +18,7 @@ * 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. @@ -33,10 +33,12 @@ #include "pipe/p_defines.h" #include "pipe/p_context.h" +#include "util/u_draw.h" #include "util/u_prim.h" #include "lp_context.h" #include "lp_state.h" +#include "lp_query.h" #include "draw/draw_context.h" @@ -53,9 +55,17 @@ llvmpipe_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) { struct llvmpipe_context *lp = llvmpipe_context(pipe); struct draw_context *draw = lp->draw; - void *mapped_indices = NULL; + const void *mapped_indices = NULL; unsigned i; + if (!llvmpipe_check_render_cond(lp)) + return; + + if (info->indirect) { + util_draw_indirect(pipe, info); + return; + } + if (lp->dirty) llvmpipe_update_derived( lp ); @@ -63,19 +73,70 @@ llvmpipe_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) * Map vertex buffers */ for (i = 0; i < lp->num_vertex_buffers; i++) { - void *buf = llvmpipe_resource_data(lp->vertex_buffer[i].buffer); - draw_set_mapped_vertex_buffer(draw, i, buf); + const void *buf = lp->vertex_buffer[i].is_user_buffer ? + lp->vertex_buffer[i].buffer.user : NULL; + size_t size = ~0; + if (!buf) { + if (!lp->vertex_buffer[i].buffer.resource) { + continue; + } + buf = llvmpipe_resource_data(lp->vertex_buffer[i].buffer.resource); + size = lp->vertex_buffer[i].buffer.resource->width0; + } + draw_set_mapped_vertex_buffer(draw, i, buf, size); } /* Map index buffer, if present */ - if (info->indexed && lp->index_buffer.buffer) - mapped_indices = llvmpipe_resource_data(lp->index_buffer.buffer); - - draw_set_mapped_index_buffer(draw, mapped_indices); + if (info->index_size) { + unsigned available_space = ~0; + mapped_indices = info->has_user_indices ? info->index.user : NULL; + if (!mapped_indices) { + mapped_indices = llvmpipe_resource_data(info->index.resource); + available_space = info->index.resource->width0; + } + draw_set_indexes(draw, + (ubyte *) mapped_indices, + info->index_size, available_space); + } llvmpipe_prepare_vertex_sampling(lp, - lp->num_vertex_sampler_views, - lp->vertex_sampler_views); + lp->num_sampler_views[PIPE_SHADER_VERTEX], + lp->sampler_views[PIPE_SHADER_VERTEX]); + llvmpipe_prepare_geometry_sampling(lp, + lp->num_sampler_views[PIPE_SHADER_GEOMETRY], + lp->sampler_views[PIPE_SHADER_GEOMETRY]); + llvmpipe_prepare_tess_ctrl_sampling(lp, + lp->num_sampler_views[PIPE_SHADER_TESS_CTRL], + lp->sampler_views[PIPE_SHADER_TESS_CTRL]); + llvmpipe_prepare_tess_eval_sampling(lp, + lp->num_sampler_views[PIPE_SHADER_TESS_EVAL], + lp->sampler_views[PIPE_SHADER_TESS_EVAL]); + + llvmpipe_prepare_vertex_images(lp, + lp->num_images[PIPE_SHADER_VERTEX], + lp->images[PIPE_SHADER_VERTEX]); + llvmpipe_prepare_geometry_images(lp, + lp->num_images[PIPE_SHADER_GEOMETRY], + lp->images[PIPE_SHADER_GEOMETRY]); + llvmpipe_prepare_tess_ctrl_images(lp, + lp->num_images[PIPE_SHADER_TESS_CTRL], + lp->images[PIPE_SHADER_TESS_CTRL]); + llvmpipe_prepare_tess_eval_images(lp, + lp->num_images[PIPE_SHADER_TESS_EVAL], + lp->images[PIPE_SHADER_TESS_EVAL]); + if (lp->gs && lp->gs->no_tokens) { + /* we have an empty geometry shader with stream output, so + attach the stream output info to the current vertex shader */ + if (lp->vs) { + draw_vs_attach_so(lp->vs, &lp->gs->stream_output); + } + } + draw_collect_pipeline_statistics(draw, + lp->active_statistics_queries > 0); + + draw_collect_primitives_generated(draw, + lp->active_primgen_queries && + !lp->queries_disabled); /* draw! */ draw_vbo(draw, info); @@ -84,12 +145,19 @@ llvmpipe_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) * unmap vertex/index buffers */ for (i = 0; i < lp->num_vertex_buffers; i++) { - draw_set_mapped_vertex_buffer(draw, i, NULL); + draw_set_mapped_vertex_buffer(draw, i, NULL, 0); } if (mapped_indices) { - draw_set_mapped_index_buffer(draw, NULL); + draw_set_indexes(draw, NULL, 0, 0); + } + + if (lp->gs && lp->gs->no_tokens) { + /* we have attached stream output to the vs for rendering, + now lets reset it */ + if (lp->vs) { + draw_vs_reset_so(lp->vs); + } } - llvmpipe_cleanup_vertex_sampling(lp); /* * TODO: Flush only when a user vertex/index buffer is present