fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-04 13:08:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

st/mesa: allow glDrawElements to work with GL_SELECT feedback

Browse source 
Not sure if this ever worked, but the current logic for setting the
min/max index is definitely wrong for indexed draws. While we're at it,
bring in all the usual logic from the non-indirect drawing path.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109086
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Ilia Mirkin 2018-12-18 22:47:05 -05:00
parent 7d7ecfbcbc
commit bac8534267
2 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/state_tracker/st_draw.c
View file

@ -160,6 +160,8 @@ prepare_draw(struct st_context *st, struct gl_context *ctx)
* This function gets plugged into the VBO module and is called when * This function gets plugged into the VBO module and is called when
* we have something to render. * we have something to render.
* Basically, translate the information into the format expected by gallium. * Basically, translate the information into the format expected by gallium.
*
* Try to keep this logic in sync with st_feedback_draw_vbo.
*/ */
static void static void
st_draw_vbo(struct gl_context *ctx, st_draw_vbo(struct gl_context *ctx,

63
src/mesa/state_tracker/st_draw_feedback.c
View file

@ -84,31 +84,10 @@ set_feedback_vertex_format(struct gl_context *ctx)
} }
/**
* Helper for drawing current vertex arrays.
*/
static void
draw_arrays(struct draw_context *draw, unsigned mode,
unsigned start, unsigned count)
{
struct pipe_draw_info info;
util_draw_init_info(&info);
info.mode = mode;
info.start = start;
info.count = count;
info.min_index = start;
info.max_index = start + count - 1;
draw_vbo(draw, &info);
}
/** /**
* Called by VBO to draw arrays when in selection or feedback mode and * Called by VBO to draw arrays when in selection or feedback mode and
* to implement glRasterPos. * to implement glRasterPos.
* This is very much like the normal draw_vbo() function above. * This function mirrors the normal st_draw_vbo().
* Look at code refactoring some day. * Look at code refactoring some day.
*/ */
void void
@ -136,10 +115,18 @@ st_feedback_draw_vbo(struct gl_context *ctx,
struct pipe_transfer *ib_transfer = NULL; struct pipe_transfer *ib_transfer = NULL;
GLuint i; GLuint i;
const void *mapped_indices = NULL; const void *mapped_indices = NULL;
struct pipe_draw_info info;
if (!draw) if (!draw)
return; return;
/* Initialize pipe_draw_info. */
info.primitive_restart = false;
info.vertices_per_patch = ctx->TessCtrlProgram.patch_vertices;
info.indirect = NULL;
info.count_from_stream_output = NULL;
info.restart_index = 0;
st_flush_bitmap_cache(st); st_flush_bitmap_cache(st);
st_invalidate_readpix_cache(st); st_invalidate_readpix_cache(st);
@ -213,9 +200,23 @@ st_feedback_draw_vbo(struct gl_context *ctx,
mapped_indices = ib->ptr; mapped_indices = ib->ptr;
} }
info.index_size = ib->index_size;
info.min_index = min_index;
info.max_index = max_index;
info.has_user_indices = true;
info.index.user = mapped_indices;
draw_set_indexes(draw, draw_set_indexes(draw,
(ubyte *) mapped_indices, (ubyte *) mapped_indices,
index_size, ~0); index_size, ~0);
if (ctx->Array._PrimitiveRestart) {
info.primitive_restart = true;
info.restart_index = _mesa_primitive_restart_index(ctx, info.index_size);
}
} else {
info.index_size = 0;
info.has_user_indices = false;
} }
/* set the constant buffer */ /* set the constant buffer */
@ -226,7 +227,23 @@ st_feedback_draw_vbo(struct gl_context *ctx,
/* draw here */ /* draw here */
for (i = 0; i < nr_prims; i++) { for (i = 0; i < nr_prims; i++) {
draw_arrays(draw, prims[i].mode, start + prims[i].start, prims[i].count); info.count = prims[i].count;
if (!info.count)
continue;
info.mode = prims[i].mode;
info.start = start + prims[i].start;
info.start_instance = prims[i].base_instance;
info.instance_count = prims[i].num_instances;
info.index_bias = prims[i].basevertex;
info.drawid = prims[i].draw_id;
if (!ib) {
info.min_index = info.start;
info.max_index = info.start + info.count - 1;
}
draw_vbo(draw, &info);
} }