Module: Mesa Branch: master Commit: 30446f8a708a647401e58da11de2dc464e37823c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=30446f8a708a647401e58da11de2dc464e37823c
Author: Eric Anholt <[email protected]> Date: Wed Mar 17 09:27:48 2010 -0700 intel: Return false like other blit failure paths if out of aperture. 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 | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_blit.c b/src/mesa/drivers/dri/intel/intel_blit.c index f4f93b5..4617370 100644 --- a/src/mesa/drivers/dri/intel/intel_blit.c +++ b/src/mesa/drivers/dri/intel/intel_blit.c @@ -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", _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
