intel: Return false like other blit failure paths if out of aperture.
authorEric Anholt <eric@anholt.net>
Wed, 17 Mar 2010 16:27:48 +0000 (09:27 -0700)
committerEric Anholt <eric@anholt.net>
Wed, 17 Mar 2010 18:24:01 +0000 (11:24 -0700)
The primary consumer of this (miptree relayout) already has this code
for handling failure, and the other paths want to know if failure
actually occurs and do something appropriate, which may not include
memcpy.

src/mesa/drivers/dri/intel/intel_blit.c

index f4f93b5a13489af6e9399be36d565f9698a7e601..46173703397520d363b4da394d11f7f5215c7793 100644 (file)
@@ -121,22 +121,8 @@ intelEmitCopyBlit(struct intel_context *intel,
 
    intel_prepare_render(intel);
 
-   if (pass >= 2) {
-      drm_intel_gem_bo_map_gtt(dst_buffer);
-      drm_intel_gem_bo_map_gtt(src_buffer);
-      _mesa_copy_rect((GLubyte *)dst_buffer->virtual + dst_offset,
-                     cpp,
-                     dst_pitch,
-                     dst_x, dst_y,
-                     w, h,
-                     (GLubyte *)src_buffer->virtual + src_offset,
-                     src_pitch,
-                     src_x, src_y);
-      drm_intel_gem_bo_unmap_gtt(src_buffer);
-      drm_intel_gem_bo_unmap_gtt(dst_buffer);
-
-      return GL_TRUE;
-   }
+   if (pass >= 2)
+      return GL_FALSE;
 
    intel_batchbuffer_require_space(intel->batch, 8 * 4);
    DBG("%s src:buf(%p)/%d+%d %d,%d dst:buf(%p)/%d+%d %d,%d sz:%dx%d\n",