X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsoftpipe%2Fsp_draw_arrays.c;h=91427348a25732c26a0460d92ea8473b36c0e64a;hb=2e94cb66933fd7b130011b53b47e0816eb8a76d5;hp=ba9e7817cebad05d716370f6d5363e0949675fa3;hpb=e73bf3b805de78299f1a652668ba4e6eab9bac94;p=mesa.git

diff --git a/src/gallium/drivers/softpipe/sp_draw_arrays.c b/src/gallium/drivers/softpipe/sp_draw_arrays.c
index ba9e7817ceb..91427348a25 100644
--- a/src/gallium/drivers/softpipe/sp_draw_arrays.c
+++ b/src/gallium/drivers/softpipe/sp_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.
@@ -34,12 +34,14 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_context.h"
 #include "util/u_inlines.h"
+#include "util/u_draw.h"
 #include "util/u_prim.h"
 
 #include "sp_context.h"
 #include "sp_query.h"
 #include "sp_state.h"
 #include "sp_texture.h"
+#include "sp_screen.h"
 
 #include "draw/draw_context.h"
 
@@ -67,6 +69,11 @@ softpipe_draw_vbo(struct pipe_context *pipe,
    if (!softpipe_check_render_cond(sp))
       return;
 
+   if (info->indirect) {
+      util_draw_indirect(pipe, info);
+      return;
+   }
+
    sp->reduced_api_prim = u_reduced_prim(info->mode);
 
    if (sp->dirty) {
@@ -75,48 +82,67 @@ softpipe_draw_vbo(struct pipe_context *pipe,
 
    /* Map vertex buffers */
    for (i = 0; i < sp->num_vertex_buffers; i++) {
-      const void *buf = sp->vertex_buffer[i].user_buffer;
+      const void *buf = sp->vertex_buffer[i].is_user_buffer ?
+                           sp->vertex_buffer[i].buffer.user : NULL;
+      size_t size = ~0;
       if (!buf) {
-         if (!sp->vertex_buffer[i].buffer) {
+         if (!sp->vertex_buffer[i].buffer.resource) {
             continue;
          }
-         buf = softpipe_resource(sp->vertex_buffer[i].buffer)->data;
+         buf = softpipe_resource_data(sp->vertex_buffer[i].buffer.resource);
+         size = sp->vertex_buffer[i].buffer.resource->width0;
       }
-      draw_set_mapped_vertex_buffer(draw, i, buf);
+      draw_set_mapped_vertex_buffer(draw, i, buf, size);
    }
 
    /* Map index buffer, if present */
-   if (info->indexed) {
-      mapped_indices = sp->index_buffer.user_buffer;
-      if (!mapped_indices)
-         mapped_indices = softpipe_resource(sp->index_buffer.buffer)->data;
+   if (info->index_size) {
+      unsigned available_space = ~0;
+      mapped_indices = info->has_user_indices ? info->index.user : NULL;
+      if (!mapped_indices) {
+         mapped_indices = softpipe_resource_data(info->index.resource);
+         available_space = info->index.resource->width0;
+      }
 
       draw_set_indexes(draw,
-                       (ubyte *) mapped_indices + sp->index_buffer.offset,
-                       sp->index_buffer.index_size);
+                       (ubyte *) mapped_indices,
+                       info->index_size, available_space);
    }
 
-
-   for (i = 0; i < sp->num_so_targets; i++) {
-      void *buf = softpipe_resource(sp->so_targets[i]->target.buffer)->data;
-      sp->so_targets[i]->mapping = buf;
+   if (softpipe_screen(sp->pipe.screen)->use_llvm) {
+      softpipe_prepare_vertex_sampling(sp,
+                                       sp->num_sampler_views[PIPE_SHADER_VERTEX],
+                                       sp->sampler_views[PIPE_SHADER_VERTEX]);
+      softpipe_prepare_geometry_sampling(sp,
+                                         sp->num_sampler_views[PIPE_SHADER_GEOMETRY],
+                                         sp->sampler_views[PIPE_SHADER_GEOMETRY]);
    }
 
-   draw_set_mapped_so_targets(draw, sp->num_so_targets,
-                              sp->so_targets);
+   if (sp->gs && !sp->gs->shader.tokens) {
+      /* we have an empty geometry shader with stream output, so
+         attach the stream output info to the current vertex shader */
+      if (sp->vs) {
+         draw_vs_attach_so(sp->vs->draw_data, &sp->gs->shader.stream_output);
+      }
+   }
+   draw_collect_pipeline_statistics(draw,
+                                    sp->active_statistics_queries > 0);
 
    /* draw! */
    draw_vbo(draw, info);
 
    /* unmap vertex/index buffers - will cause draw module to flush */
    for (i = 0; i < sp->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_indexes(draw, NULL, 0);
+      draw_set_indexes(draw, NULL, 0, 0);
    }
 
-   draw_set_mapped_so_targets(draw, 0, NULL);
+   if (softpipe_screen(sp->pipe.screen)->use_llvm) {
+      softpipe_cleanup_vertex_sampling(sp);
+      softpipe_cleanup_geometry_sampling(sp);
+   }
 
    /*
     * TODO: Flush only when a user vertex/index buffer is present