Merge branch 'mesa_7_6_branch'

[mesa.git] / src / mesa / drivers / dri / intel / intel_pixel_read.c

diff --git a/src/mesa/drivers/dri/intel/intel_pixel_read.c b/src/mesa/drivers/dri/intel/intel_pixel_read.c
index 74da6d39a2fa6d3e2cf120ea6c470898e5e047ce..aef760c015b39931bf3c11a91784d3a0107628b5 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_pixel_read.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_read.c
@@ -180,16 +180,7 @@ do_blit_readpixels(GLcontext * ctx,
    if (!src)
       return GL_FALSE;
 
-   if (pack->BufferObj->Name) {
-      /* XXX This validation should be done by core mesa:
-       */
-      if (!_mesa_validate_pbo_access(2, pack, width, height, 1,
-                                     format, type, pixels)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawPixels");
-         return GL_TRUE;
-      }
-   }
-   else {
+   if (!_mesa_is_bufferobj(pack->BufferObj)) {
       /* PBO only for now:
        */
       if (INTEL_DEBUG & DEBUG_PIXEL)
@@ -261,6 +252,21 @@ 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,
+                               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)) {
+           UNLOCK_HARDWARE(intel);
+           return GL_FALSE;
+        }
+=======
          intelEmitCopyBlit(intel,
                            src->cpp,
                            src->pitch, src->buffer, 0, src->tiling,
@@ -271,6 +277,7 @@ do_blit_readpixels(GLcontext * ctx,
                            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);