enum pipe_error
svga_swtnl_draw_vbo(struct svga_context *svga,
- const struct pipe_draw_info *info)
+ const struct pipe_draw_info *info,
+ struct pipe_resource *indexbuf,
+ unsigned index_offset)
{
struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS] = { 0 };
struct pipe_transfer *ib_transfer = NULL;
struct pipe_transfer *cb_transfer[SVGA_MAX_CONST_BUFS] = { 0 };
struct draw_context *draw = svga->swtnl.draw;
- unsigned i, old_num_vertex_buffers;
+ MAYBE_UNUSED unsigned old_num_vertex_buffers;
+ unsigned i;
const void *map;
enum pipe_error ret;
+ SVGA_STATS_TIME_PUSH(svga_sws(svga), SVGA_STATS_TIME_SWTNLDRAWVBO);
+
assert(!svga->dirty);
assert(svga->state.sw.need_swtnl);
assert(draw);
* Map vertex buffers
*/
for (i = 0; i < svga->curr.num_vertex_buffers; i++) {
- if (svga->curr.vb[i].buffer) {
+ if (svga->curr.vb[i].buffer.resource) {
map = pipe_buffer_map(&svga->pipe,
- svga->curr.vb[i].buffer,
+ svga->curr.vb[i].buffer.resource,
PIPE_TRANSFER_READ,
&vb_transfer[i]);
/* Map index buffer, if present */
map = NULL;
- if (info->indexed && svga->curr.ib.buffer) {
- map = pipe_buffer_map(&svga->pipe, svga->curr.ib.buffer,
+ if (info->index_size && indexbuf) {
+ map = pipe_buffer_map(&svga->pipe, indexbuf,
PIPE_TRANSFER_READ,
&ib_transfer);
+ map = (ubyte *) map + index_offset;
draw_set_indexes(draw,
- (const ubyte *) map + svga->curr.ib.offset,
- svga->curr.ib.index_size, ~0);
+ (const ubyte *) map,
+ info->index_size, ~0);
}
/* Map constant buffers */
* unmap vertex/index buffers
*/
for (i = 0; i < svga->curr.num_vertex_buffers; i++) {
- if (svga->curr.vb[i].buffer) {
+ if (svga->curr.vb[i].buffer.resource) {
pipe_buffer_unmap(&svga->pipe, vb_transfer[i]);
draw_set_mapped_vertex_buffer(draw, i, NULL, 0);
}
svga->state.sw.in_swtnl_draw = FALSE;
svga->dirty |= SVGA_NEW_NEED_PIPELINE | SVGA_NEW_NEED_SWVFETCH;
+ SVGA_STATS_TIME_POP(svga_sws(svga));
return ret;
}
-
-
-boolean svga_init_swtnl( struct svga_context *svga )
+boolean
+svga_init_swtnl(struct svga_context *svga)
{
struct svga_screen *screen = svga_screen(svga->pipe.screen);
goto fail;
- draw_set_rasterize_stage(svga->swtnl.draw,
- draw_vbuf_stage( svga->swtnl.draw, svga->swtnl.backend ));
+ draw_set_rasterize_stage(svga->swtnl.draw,
+ draw_vbuf_stage(svga->swtnl.draw, svga->swtnl.backend));
draw_set_render(svga->swtnl.draw, svga->swtnl.backend);
util_blitter_destroy(svga->blitter);
if (svga->swtnl.backend)
- svga->swtnl.backend->destroy( svga->swtnl.backend );
+ svga->swtnl.backend->destroy(svga->swtnl.backend);
if (svga->swtnl.draw)
- draw_destroy( svga->swtnl.draw );
+ draw_destroy(svga->swtnl.draw);
return FALSE;
}
-void svga_destroy_swtnl( struct svga_context *svga )
+void
+svga_destroy_swtnl(struct svga_context *svga)
{
- draw_destroy( svga->swtnl.draw );
+ draw_destroy(svga->swtnl.draw);
}