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

st/mesa: don't call util_draw_init_info in st_draw_vbo

Browse source
This commit is contained in:
Marek Olšák 2017-04-09 13:17:54 +02:00
parent 330d0607ed
commit c334c7dd75
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,7 +166,11 @@ st_draw_vbo(struct gl_context *ctx,
return;
}
util_draw_init_info(&info);
/* 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;
if (ib) {
struct gl_buffer_object *bufobj = ib->obj;
@ -183,6 +187,7 @@ st_draw_vbo(struct gl_context *ctx,
if (_mesa_is_bufferobj(bufobj)) {
/* indices are in a real VBO */
info.has_user_indices = false;
info.index.resource = st_buffer_object(bufobj)->buffer;
start = pointer_to_offset(ib->ptr) / info.index_size;
} else {
@ -194,6 +199,8 @@ st_draw_vbo(struct gl_context *ctx,
setup_primitive_restart(ctx, &info);
}
else {
info.index_size = 0;
/* Transform feedback drawing is always non-indexed. */
/* Set info.count_from_stream_output. */
if (tfb_vertcount) {
@ -211,7 +218,6 @@ st_draw_vbo(struct gl_context *ctx,
info.count = prims[i].count;
info.start_instance = prims[i].base_instance;
info.instance_count = prims[i].num_instances;
info.vertices_per_patch = ctx->TessCtrlProgram.patch_vertices;
info.index_bias = prims[i].basevertex;
info.drawid = prims[i].draw_id;
if (!ib) {