r300/r600: move some bo offsets checking to blit code

In preperation for texcopy code sharing.

diff --git a/src/mesa/drivers/dri/r300/r300_blit.c b/src/mesa/drivers/dri/r300/r300_blit.c
index 99068886b7fc2f26f3557fe66a76ddb1cc29ed3a..e24c7955d4b4471c150d0d36fa543a86db70b9b5 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_blit.c
+++ b/src/mesa/drivers/dri/r300/r300_blit.c
@@ -592,6 +592,10 @@ unsigned r300_blit(GLcontext *ctx,
         return 0;
     }
 
+    if (src_offset % 32 || dst_offset % 32) {
+        return GL_FALSE;
+    }
+
     if (0) {
         fprintf(stderr, "src: size [%d x %d], pitch %d, "
                 "offset [%d x %d], format %s, bo %p\n",

diff --git a/src/mesa/drivers/dri/r300/r300_texcopy.c b/src/mesa/drivers/dri/r300/r300_texcopy.c
index 716a38a0a4d952ccb6ad41b350c519a118fdedff..c7d57fb5de05b525608b0e63077a510541e9928c 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texcopy.c
+++ b/src/mesa/drivers/dri/r300/r300_texcopy.c
@@ -68,10 +68,6 @@ do_copy_texsubimage(GLcontext *ctx,
     intptr_t src_offset = rrb->draw_offset;
     intptr_t dst_offset = radeon_miptree_image_offset(timg->mt, _mesa_tex_target_to_face(target), level);
 
-    if (src_offset % 32 || dst_offset % 32) {
-        return GL_FALSE;
-    }
-
     if (0) {
         fprintf(stderr, "%s: copying to face %d, level %d\n",
                 __FUNCTION__, _mesa_tex_target_to_face(target), level);

diff --git a/src/mesa/drivers/dri/r600/r600_blit.c b/src/mesa/drivers/dri/r600/r600_blit.c
index 68324766c3c0bda6466f9e7b2ed4e00cc877957a..58eb91ec615c4536e50971e3b70303c5841cd841 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_blit.c
+++ b/src/mesa/drivers/dri/r600/r600_blit.c
@@ -1590,6 +1590,10 @@ GLboolean r600_blit(GLcontext *ctx,
         return GL_FALSE;
     }
 
+    if (src_offset % 256 || dst_offset % 256) {
+        return GL_FALSE;
+    }
+
     if (0) {
         fprintf(stderr, "src: width %d, height %d, pitch %d vs %d, format %s\n",
                 src_width, src_height, src_pitch,

diff --git a/src/mesa/drivers/dri/r600/r600_texcopy.c b/src/mesa/drivers/dri/r600/r600_texcopy.c
index dcea6c06e4baf2a72069434237805fb07f950164..12b34030512424133a61c1535bfb5ef69d552aa3 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_texcopy.c
+++ b/src/mesa/drivers/dri/r600/r600_texcopy.c
@@ -69,10 +69,6 @@ do_copy_texsubimage(GLcontext *ctx,
     intptr_t src_offset = rrb->draw_offset;
     intptr_t dst_offset = radeon_miptree_image_offset(timg->mt, _mesa_tex_target_to_face(target), level);
 
-    if (src_offset % 256 || dst_offset % 256) {
-        return GL_FALSE;
-    }
-
     if (0) {
         fprintf(stderr, "%s: copying to face %d, level %d\n",
                 __FUNCTION__, _mesa_tex_target_to_face(target), level);