diff options
| author | Pauli Nieminen <[email protected]> | 2009-08-29 00:46:08 +0300 |
|---|---|---|
| committer | Pauli Nieminen <[email protected]> | 2009-08-29 00:46:57 +0300 |
| commit | 0926a5f4a110926711d0f8a4eb297dc772b09aa2 (patch) | |
| tree | e2683648e298c0524d1640c5bea56660f8eeff0a /src/mesa/drivers/dri/radeon/radeon_dma.c | |
| parent | 55e7abf81f3c515919ef8ff69125c7aafd274716 (diff) | |
radeon: Fix swtcl emit pediction.
Problem was to find the correct place to run prediction. Only place that is
called for every primitive is ALLOC_VERTS so we have to do prediction there
before allocation.
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_dma.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_dma.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c index 7aa59675b7a..386262b126e 100644 --- a/src/mesa/drivers/dri/radeon/radeon_dma.c +++ b/src/mesa/drivers/dri/radeon/radeon_dma.c @@ -182,9 +182,6 @@ void radeonRefillCurrentDmaRegion(radeonContextPtr rmesa, int size) if (RADEON_DEBUG & (DEBUG_IOCTL | DEBUG_DMA)) fprintf(stderr, "%s\n", __FUNCTION__); - if (rmesa->dma.flush) { - rmesa->dma.flush(rmesa->glCtx); - } /* unmap old reserved bo */ if (!is_empty_list(&rmesa->dma.reserved)) @@ -430,9 +427,15 @@ rcommonAllocDmaLowVerts( radeonContextPtr rmesa, int nverts, int vsize ) void *head; if (RADEON_DEBUG & DEBUG_IOCTL) fprintf(stderr, "%s\n", __FUNCTION__); - if (is_empty_list(&rmesa->dma.reserved) - || rmesa->dma.current_vertexptr + bytes > first_elem(&rmesa->dma.reserved)->bo->size) { + if(is_empty_list(&rmesa->dma.reserved) + ||rmesa->dma.current_vertexptr + bytes > first_elem(&rmesa->dma.reserved)->bo->size) { + if (rmesa->dma.flush) { + rmesa->dma.flush(rmesa->glCtx); + } + radeonRefillCurrentDmaRegion(rmesa, bytes); + + return NULL; } if (!rmesa->dma.flush) { |