fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-01 09:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel: fallback for intelEmitCopyBlit.

Browse source 
Use _mesa_copy_rect instead of BLT operation if dri_bufmgr_check_aperture_space
still fails after flushing batchbuffer. Partial fix for #17964.
This commit is contained in:
Xiang, Haihao 2008-10-24 15:55:32 +08:00
parent 8c20c913f8
commit f657c81911
1 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/mesa/drivers/dri/intel/intel_blit.c
View file

@ -272,24 +272,53 @@ intelEmitCopyBlit(struct intel_context *intel,
GLshort w, GLshort h,
GLenum logic_op)
{
GLuint CMD, BR13;
GLuint CMD, BR13, pass = 0;
int dst_y2 = dst_y + h;
int dst_x2 = dst_x + w;
dri_bo *aper_array[3];
BATCH_LOCALS;
/* do space/cliprects check before going any further */
intel_batchbuffer_require_space(intel->batch, 8 * 4, NO_LOOP_CLIPRECTS);
again:
aper_array[0] = intel->batch->buf;
aper_array[1] = dst_buffer;
aper_array[2] = src_buffer;
do {
aper_array[0] = intel->batch->buf;
aper_array[1] = dst_buffer;
aper_array[2] = src_buffer;
if (dri_bufmgr_check_aperture_space(aper_array, 3) != 0) {
intel_batchbuffer_flush(intel->batch);
goto again;
if (dri_bufmgr_check_aperture_space(aper_array, 3) != 0) {
intel_batchbuffer_flush(intel->batch);
pass++;
} else
break;
} while (pass < 2);
if (pass >= 2) {
GLboolean locked = GL_FALSE;
if (!intel->locked) {
LOCK_HARDWARE(intel);
locked = GL_TRUE;
}
dri_bo_map(dst_buffer, GL_TRUE);
dri_bo_map(src_buffer, GL_TRUE);
_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);
dri_bo_unmap(src_buffer);
dri_bo_unmap(dst_buffer);
if (locked)
UNLOCK_HARDWARE(intel);
return;
}
intel_batchbuffer_require_space(intel->batch, 8 * 4, NO_LOOP_CLIPRECTS);
DBG("%s src:buf(%p)/%d+%d %d,%d dst:buf(%p)/%d+%d %d,%d sz:%dx%d\n",
__FUNCTION__,
src_buffer, src_pitch, src_offset, src_x, src_y,