mesa/st: Update for index bias interface change.
This commit is contained in:
@@ -676,7 +676,7 @@ st_draw_vbo(GLcontext *ctx,
|
|||||||
for (i = 0; i < nr_prims; i++) {
|
for (i = 0; i < nr_prims; i++) {
|
||||||
prim = translate_prim( ctx, prims[i].mode );
|
prim = translate_prim( ctx, prims[i].mode );
|
||||||
|
|
||||||
pipe->draw_range_elements(pipe, indexBuf, indexSize,
|
pipe->draw_range_elements(pipe, indexBuf, indexSize, 0,
|
||||||
min_index, max_index, prim,
|
min_index, max_index, prim,
|
||||||
prims[i].start + indexOffset, prims[i].count);
|
prims[i].start + indexOffset, prims[i].count);
|
||||||
}
|
}
|
||||||
@@ -686,12 +686,12 @@ st_draw_vbo(GLcontext *ctx,
|
|||||||
prim = translate_prim( ctx, prims[i].mode );
|
prim = translate_prim( ctx, prims[i].mode );
|
||||||
|
|
||||||
if (prims[i].num_instances == 1) {
|
if (prims[i].num_instances == 1) {
|
||||||
pipe->draw_elements(pipe, indexBuf, indexSize, prim,
|
pipe->draw_elements(pipe, indexBuf, indexSize, 0, prim,
|
||||||
prims[i].start + indexOffset,
|
prims[i].start + indexOffset,
|
||||||
prims[i].count);
|
prims[i].count);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
pipe->draw_elements_instanced(pipe, indexBuf, indexSize, prim,
|
pipe->draw_elements_instanced(pipe, indexBuf, indexSize, 0, prim,
|
||||||
prims[i].start + indexOffset,
|
prims[i].start + indexOffset,
|
||||||
prims[i].count,
|
prims[i].count,
|
||||||
0, prims[i].num_instances);
|
0, prims[i].num_instances);
|
||||||
|
@@ -229,16 +229,16 @@ st_feedback_draw_vbo(GLcontext *ctx,
|
|||||||
map = pipe_buffer_map(pipe, index_buffer_handle,
|
map = pipe_buffer_map(pipe, index_buffer_handle,
|
||||||
PIPE_TRANSFER_READ, &ib_transfer);
|
PIPE_TRANSFER_READ, &ib_transfer);
|
||||||
|
|
||||||
draw_set_mapped_element_buffer(draw, indexSize, map);
|
draw_set_mapped_element_buffer(draw, indexSize, 0, map);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
draw_set_mapped_element_buffer(draw, indexSize, (void *) ib->ptr);
|
draw_set_mapped_element_buffer(draw, indexSize, 0, (void *) ib->ptr);
|
||||||
ib_transfer = NULL;
|
ib_transfer = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* no index/element buffer */
|
/* no index/element buffer */
|
||||||
draw_set_mapped_element_buffer(draw, 0, NULL);
|
draw_set_mapped_element_buffer(draw, 0, 0, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -275,7 +275,7 @@ st_feedback_draw_vbo(GLcontext *ctx,
|
|||||||
}
|
}
|
||||||
if (index_buffer_handle) {
|
if (index_buffer_handle) {
|
||||||
pipe_buffer_unmap(pipe, index_buffer_handle, ib_transfer);
|
pipe_buffer_unmap(pipe, index_buffer_handle, ib_transfer);
|
||||||
draw_set_mapped_element_buffer(draw, 0, NULL);
|
draw_set_mapped_element_buffer(draw, 0, 0, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user