Mesa (master): Fix merge fail
Brian Paul
brianp at kemper.freedesktop.org
Thu Sep 10 21:43:53 UTC 2009
Module: Mesa
Branch: master
Commit: 8fd4e4dfc32e4fd44dc41948d0c35ece078d44b3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fd4e4dfc32e4fd44dc41948d0c35ece078d44b3
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Sep 10 11:44:53 2009 -0700
Fix merge fail
One of the conflicst from this merge was missed:
commit 0c309bb494b6ee1c403442d1207743f749f95b6e
Merge: c6c44bf d27d659
Author: Brian Paul <brianp at vmware.com>
Date: Wed Sep 9 08:33:39 2009 -0600
---
src/mesa/drivers/dri/intel/intel_pixel_read.c | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_read.c b/src/mesa/drivers/dri/intel/intel_pixel_read.c
index 30b06f2..8713463 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_read.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_read.c
@@ -261,7 +261,6 @@ do_blit_readpixels(GLcontext * ctx,
if (!intel_intersect_cliprects(&rect, &src_rect, &box[i]))
continue;
-<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_pixel_read.c
if (!intelEmitCopyBlit(intel,
src->cpp,
src->pitch, src->buffer, 0, src->tiling,
@@ -275,18 +274,6 @@ do_blit_readpixels(GLcontext * ctx,
UNLOCK_HARDWARE(intel);
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);
More information about the mesa-commit
mailing list