summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorMaciej Cencora <m.cencora@gmail.com>2010-01-18 22:52:40 +0100
committerMaciej Cencora <m.cencora@gmail.com>2010-01-19 23:38:34 +0100
commit0174dac5f3bd47c0a2dcd40319bff288c83ee96a (patch)
tree62d9b7bbf211d1731cebe5c53655f0ab497a48a5 /src/mesa
parentac8afd401fa5840cf726184329dac75197a50c2e (diff)
r300/r600: move some bo offsets checking to blit code
In preperation for texcopy code sharing.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r300/r300_blit.c4
-rw-r--r--src/mesa/drivers/dri/r300/r300_texcopy.c4
-rw-r--r--src/mesa/drivers/dri/r600/r600_blit.c4
-rw-r--r--src/mesa/drivers/dri/r600/r600_texcopy.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_blit.c b/src/mesa/drivers/dri/r300/r300_blit.c
index 99068886b7..e24c7955d4 100644
--- 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 716a38a0a4..c7d57fb5de 100644
--- 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 68324766c3..58eb91ec61 100644
--- 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 dcea6c06e4..12b3403051 100644
--- 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);