#include "draw/draw_gs.h"
#include "draw/draw_private.h"
#include "draw/draw_pt.h"
+#include "draw/draw_vbuf.h"
#include "draw/draw_vs.h"
#include "tgsi/tgsi_dump.h"
#include "util/u_math.h"
/* Flush draw state if eltSize changed.
* This could be improved so only the frontend is flushed since it
* converts all indices to ushorts and the fetch part of the middle
- * always perpares both linear and indexed.
+ * always prepares both linear and indexed.
*/
frontend->flush( frontend, DRAW_FLUSH_STATE_CHANGE );
frontend = NULL;
draw->pt.opt = opt;
}
+ if (draw->pt.rebind_parameters) {
+ /* update constants, viewport dims, clip planes, etc */
+ middle->bind_parameters(middle);
+ draw->pt.rebind_parameters = FALSE;
+ }
+
frontend->run( frontend, start, count );
return TRUE;
void draw_pt_flush( struct draw_context *draw, unsigned flags )
{
+ assert(flags);
+
if (draw->pt.frontend) {
draw->pt.frontend->flush( draw->pt.frontend, flags );
/* don't prepare if we only are flushing the backend */
- if (!(flags & DRAW_FLUSH_BACKEND))
+ if (flags & DRAW_FLUSH_STATE_CHANGE)
draw->pt.frontend = NULL;
}
+
+ if (flags & DRAW_FLUSH_PARAMETER_CHANGE) {
+ draw->pt.rebind_parameters = TRUE;
+ }
}
uint j;
if (draw->pt.user.eltSize) {
- const char *elts;
-
/* indexed arrays */
- elts = (const char *) draw->pt.user.elts;
- elts += draw->pt.index_buffer.offset;
switch (draw->pt.user.eltSize) {
case 1:
{
- const ubyte *elem = (const ubyte *) elts;
+ const ubyte *elem = (const ubyte *) draw->pt.user.elts;
ii = elem[start + i];
}
break;
case 2:
{
- const ushort *elem = (const ushort *) elts;
+ const ushort *elem = (const ushort *) draw->pt.user.elts;
ii = elem[start + i];
}
break;
case 4:
{
- const uint *elem = (const uint *) elts;
+ const uint *elem = (const uint *) draw->pt.user.elts;
ii = elem[start + i];
}
break;
assert(info->primitive_restart);
- if (draw->pt.user.elts) {
+ if (draw->pt.user.eltSize) {
/* indexed prims (draw_elements) */
cur_start = start;
cur_count = 0;
info.count = count;
info.start_instance = startInstance;
info.instance_count = instanceCount;
-
- info.indexed = (draw->pt.user.elts != NULL);
- if (!info.indexed) {
- info.min_index = start;
- info.max_index = start + count - 1;
- }
+ info.min_index = start;
+ info.max_index = start + count - 1;
draw_vbo(draw, &info);
}
+/**
+ * Resolve true values within pipe_draw_info.
+ * If we're rendering from transform feedback/stream output
+ * buffers both the count and max_index need to be computed
+ * from the attached stream output target.
+ */
+static void
+resolve_draw_info(const struct pipe_draw_info *raw_info,
+ struct pipe_draw_info *info)
+{
+ memcpy(info, raw_info, sizeof(struct pipe_draw_info));
+
+ if (raw_info->count_from_stream_output) {
+ struct draw_so_target *target =
+ (struct draw_so_target *)info->count_from_stream_output;
+ info->count = target->emitted_vertices;
+
+ /* Stream output draw can not be indexed */
+ debug_assert(!info->indexed);
+ info->max_index = info->count - 1;
+ }
+}
/**
* Draw vertex arrays.
* This is the main entrypoint into the drawing module. If drawing an indexed
- * primitive, the draw_set_index_buffer() and draw_set_mapped_index_buffer()
- * functions should have already been called to specify the element/index
- * buffer information.
+ * primitive, the draw_set_indexes() function should have already been called
+ * to specify the element/index buffer information.
*/
void
draw_vbo(struct draw_context *draw,
{
unsigned instance;
unsigned index_limit;
+ unsigned count;
+ struct pipe_draw_info resolved_info;
+
+ resolve_draw_info(info, &resolved_info);
+ info = &resolved_info;
assert(info->instance_count > 0);
if (info->indexed)
assert(draw->pt.user.elts);
-
- draw->pt.user.eltSize =
- (info->indexed) ? draw->pt.index_buffer.index_size : 0;
+
+ count = info->count;
draw->pt.user.eltBias = info->index_bias;
draw->pt.user.min_index = info->min_index;
draw->pt.user.max_index = info->max_index;
+ draw->pt.user.eltSize = info->indexed ? draw->pt.user.eltSizeIB : 0;
if (0)
debug_printf("draw_vbo(mode=%u start=%u count=%u):\n",
return;
}
- draw->pt.max_index = index_limit - 1;
+ /* If we're collecting stats then make sure we start from scratch */
+ if (draw->collect_statistics) {
+ memset(&draw->statistics, 0, sizeof(draw->statistics));
+ }
+ draw->pt.max_index = index_limit - 1;
/*
* TODO: We could use draw->pt.max_index to further narrow
for (instance = 0; instance < info->instance_count; instance++) {
draw->instance_id = instance + info->start_instance;
+ draw_new_instance(draw);
+
if (info->primitive_restart) {
draw_pt_arrays_restart(draw, info);
}
else {
- draw_pt_arrays(draw, info->mode, info->start, info->count);
+ draw_pt_arrays(draw, info->mode, info->start, count);
}
}
+
+ /* If requested emit the pipeline statistics for this run */
+ if (draw->collect_statistics) {
+ draw->render->pipeline_statistics(draw->render, &draw->statistics);
+ }
}