From da2123051c3923a2953cdd96f05ad684e7d3c8c3 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sat, 31 Mar 2012 22:17:19 +0200 Subject: r300g/swtcl: don't enter u_vbuf_mgr --- src/gallium/drivers/r300/r300_blit.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers/r300/r300_blit.c') diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index d1326380f3d..920612b8de5 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -63,8 +63,13 @@ static void r300_blitter_begin(struct r300_context* r300, enum r300_blitter_op o util_blitter_save_vertex_shader(r300->blitter, r300->vs_state.state); util_blitter_save_viewport(r300->blitter, &r300->viewport); util_blitter_save_vertex_elements(r300->blitter, r300->velems); - util_blitter_save_vertex_buffers(r300->blitter, r300->vbuf_mgr->nr_vertex_buffers, - r300->vbuf_mgr->vertex_buffer); + if (r300->vbuf_mgr) { + util_blitter_save_vertex_buffers(r300->blitter, r300->vbuf_mgr->nr_vertex_buffers, + r300->vbuf_mgr->vertex_buffer); + } else { + util_blitter_save_vertex_buffers(r300->blitter, r300->swtcl_nr_vertex_buffers, + r300->swtcl_vertex_buffer); + } if (op & R300_SAVE_FRAMEBUFFER) { util_blitter_save_framebuffer(r300->blitter, r300->fb_state.state); -- cgit v1.2.3