Module: Mesa
Branch: master
Commit: ea3494b98cc764ead7e96746c0247ebc3a68e629
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea3494b98cc764ead7e96746c0247ebc3a68e629

Author: Maciej Cencora <[email protected]>
Date:   Thu Mar  4 18:35:55 2010 +0100

r300: allow src and dst BOs to be placed in GTT during blit

Fixes some relocation failures

---

 src/mesa/drivers/dri/r300/r300_blit.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_blit.c 
b/src/mesa/drivers/dri/r300/r300_blit.c
index f9c085e..d870c7f 100644
--- a/src/mesa/drivers/dri/r300/r300_blit.c
+++ b/src/mesa/drivers/dri/r300/r300_blit.c
@@ -385,18 +385,12 @@ static GLboolean validate_buffers(struct r300_context 
*r300,
     radeon_cs_space_reset_bos(r300->radeon.cmdbuf.cs);
 
     ret = radeon_cs_space_check_with_bo(r300->radeon.cmdbuf.cs,
-                                        src_bo, RADEON_GEM_DOMAIN_VRAM, 0);
+                                        src_bo, RADEON_GEM_DOMAIN_VRAM | 
RADEON_GEM_DOMAIN_GTT, 0);
     if (ret)
         return GL_FALSE;
 
     ret = radeon_cs_space_check_with_bo(r300->radeon.cmdbuf.cs,
-                                        dst_bo, 0, RADEON_GEM_DOMAIN_VRAM);
-    if (ret)
-        return GL_FALSE;
-
-    ret = radeon_cs_space_check_with_bo(r300->radeon.cmdbuf.cs,
-                                        
first_elem(&r300->radeon.dma.reserved)->bo,
-                                        RADEON_GEM_DOMAIN_GTT, 0);
+                                        dst_bo, 0, RADEON_GEM_DOMAIN_VRAM | 
RADEON_GEM_DOMAIN_GTT);
     if (ret)
         return GL_FALSE;
 

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to