svga: Flush upload buffers or we get asserts

Based on work from Jakob Bornecrantz, Michel Dänzer, and Brian Paul.
This commit is contained in:
José Fonseca 2011-02-02 11:28:41 +00:00
parent dfdb9fda82
commit 50278c0901
2 changed files with 7 additions and 5 deletions

View File

@ -207,11 +207,6 @@ void svga_context_flush( struct svga_context *svga,
svga->curr.nr_fbs = 0;
/* Unmap upload manager buffers:
*/
u_upload_flush(svga->upload_vb);
u_upload_flush(svga->upload_ib);
/* Ensure that texture dma uploads are processed
* before submitting commands.
*/

View File

@ -28,6 +28,7 @@
#include "pipe/p_defines.h"
#include "util/u_memory.h"
#include "util/u_math.h"
#include "util/u_upload_mgr.h"
#include "svga_context.h"
#include "svga_draw.h"
@ -143,6 +144,9 @@ svga_hwtnl_flush( struct svga_hwtnl *hwtnl )
SVGA3dPrimitiveRange *prim;
unsigned i;
/* Unmap upload manager vertex buffers */
u_upload_flush(svga->upload_vb);
for (i = 0; i < hwtnl->cmd.vdecl_count; i++) {
handle = svga_buffer_handle(svga, hwtnl->cmd.vdecl_vb[i]);
if (handle == NULL)
@ -151,6 +155,9 @@ svga_hwtnl_flush( struct svga_hwtnl *hwtnl )
vb_handle[i] = handle;
}
/* Unmap upload manager index buffers */
u_upload_flush(svga->upload_ib);
for (i = 0; i < hwtnl->cmd.prim_count; i++) {
if (hwtnl->cmd.prim_ib[i]) {
handle = svga_buffer_handle(svga, hwtnl->cmd.prim_ib[i]);