summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/radeon/radeon_blit.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-03 16:27:21 +1000
committerDave Airlie <airlied@redhat.com>2010-03-03 16:28:53 +1000
commitdaf85c460875c944d6918fdf4041467d97cba41e (patch)
treedf46b197b3fc27a9eafce3b7b884a6843c05f805 /src/mesa/drivers/dri/radeon/radeon_blit.c
parent4cb7642ff3ba390e2918d71220625a837bf8a7b9 (diff)
radeon/r200/r300/r600: fix blit BO buffer validation
there is no need for these to be persistent since we flush the CS at the end of the blit, and we don't reuse these buffers at all. on my r600 the Wine DX9 test suite doesn't crash at least anymore. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_blit.c')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_blit.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_blit.c b/src/mesa/drivers/dri/radeon/radeon_blit.c
index 0df4fbb33c..34b9af4063 100644
--- a/src/mesa/drivers/dri/radeon/radeon_blit.c
+++ b/src/mesa/drivers/dri/radeon/radeon_blit.c
@@ -204,11 +204,15 @@ static GLboolean validate_buffers(struct r100_context *r100,
struct radeon_bo *dst_bo)
{
int ret;
- radeon_cs_space_add_persistent_bo(r100->radeon.cmdbuf.cs,
- src_bo, RADEON_GEM_DOMAIN_VRAM, 0);
+ ret = radeon_cs_space_check_with_bo(r100->radeon.cmdbuf.cs,
+ src_bo, RADEON_GEM_DOMAIN_VRAM, 0);
+ if (ret)
+ return GL_FALSE;
- radeon_cs_space_add_persistent_bo(r100->radeon.cmdbuf.cs,
- dst_bo, 0, RADEON_GEM_DOMAIN_VRAM);
+ ret = radeon_cs_space_check_with_bo(r100->radeon.cmdbuf.cs,
+ dst_bo, 0, RADEON_GEM_DOMAIN_VRAM);
+ if (ret)
+ return GL_FALSE;
ret = radeon_cs_space_check_with_bo(r100->radeon.cmdbuf.cs,
first_elem(&r100->radeon.dma.reserved)->bo,