diff options
author | Pauli Nieminen <suokkos@gmail.com> | 2009-08-26 22:24:25 +0300 |
---|---|---|
committer | Pauli Nieminen <suokkos@gmail.com> | 2009-08-27 00:01:56 +0300 |
commit | 97029c1860e8a99448ac157408e71bea3aa2559f (patch) | |
tree | baa7b07538918a1777dba13d87ea1fe82e3dcadf /src/mesa/drivers/dri/radeon/radeon_dma.c | |
parent | 72052210516b4cb0e082e0c56822cd33b1562630 (diff) | |
download | external_mesa3d-97029c1860e8a99448ac157408e71bea3aa2559f.zip external_mesa3d-97029c1860e8a99448ac157408e71bea3aa2559f.tar.gz external_mesa3d-97029c1860e8a99448ac157408e71bea3aa2559f.tar.bz2 |
radeon/r200/r300: Fix swtcl flushing not to invalidate dma region.
We were check command buffer sizes too alte so allocated dma regions
were freed before relocations so space checking failed.
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_dma.c')
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_dma.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c index 51f764c..7aa5967 100644 --- a/src/mesa/drivers/dri/radeon/radeon_dma.c +++ b/src/mesa/drivers/dri/radeon/radeon_dma.c @@ -428,7 +428,6 @@ rcommonAllocDmaLowVerts( radeonContextPtr rmesa, int nverts, int vsize ) { GLuint bytes = vsize * nverts; void *head; -restart: if (RADEON_DEBUG & DEBUG_IOCTL) fprintf(stderr, "%s\n", __FUNCTION__); if (is_empty_list(&rmesa->dma.reserved) @@ -437,13 +436,7 @@ restart: } if (!rmesa->dma.flush) { - /* make sure we have enough space to use this in cmdbuf */ - rcommonEnsureCmdBufSpace(rmesa, - radeonCountStateEmitSize( rmesa ) + (20*sizeof(int)), - __FUNCTION__); /* if cmdbuf flushed DMA restart */ - if (is_empty_list(&rmesa->dma.reserved)) - goto restart; rmesa->glCtx->Driver.NeedFlush |= FLUSH_STORED_VERTICES; rmesa->dma.flush = rcommon_flush_last_swtcl_prim; } |