fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix merge fail

Browse source 
One of the conflicst from this merge was missed:

commit 0c309bb494
Merge: c6c44bf d27d659
Author: Brian Paul <brianp@vmware.com>
Date:   Wed Sep 9 08:33:39 2009 -0600
This commit is contained in:
Ian Romanick 2009-09-10 11:44:53 -07:00
parent d78a196121
commit 8fd4e4dfc3
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mesa/drivers/dri/intel/intel_pixel_read.c
View file

@ -261,7 +261,6 @@ do_blit_readpixels(GLcontext * ctx,
if (!intel_intersect_cliprects(&rect, &src_rect, &box[i])) if (!intel_intersect_cliprects(&rect, &src_rect, &box[i]))
continue; continue;
<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_pixel_read.c
if (!intelEmitCopyBlit(intel, if (!intelEmitCopyBlit(intel,
src->cpp, src->cpp,
src->pitch, src->buffer, 0, src->tiling, src->pitch, src->buffer, 0, src->tiling,
@ -275,18 +274,6 @@ do_blit_readpixels(GLcontext * ctx,
UNLOCK_HARDWARE(intel); UNLOCK_HARDWARE(intel);
return GL_FALSE; return GL_FALSE;
} }
=======
intelEmitCopyBlit(intel,
src->cpp,
src->pitch, src->buffer, 0, src->tiling,
rowLength, dst_buffer, dst_offset, GL_FALSE,
rect.x1,
rect.y1,
rect.x1 - src_rect.x1,
rect.y2 - src_rect.y2,
rect.x2 - rect.x1, rect.y2 - rect.y1,
GL_COPY);
>>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_pixel_read.c
} }
} }
UNLOCK_HARDWARE(intel); UNLOCK_HARDWARE(intel);