[intel] Move bufmgr back to context instead of screen, fixing glthreads.

[mesa.git] / src / mesa / drivers / dri / i915 / intel_pixel_copy.c

diff --git a/src/mesa/drivers/dri/i915/intel_pixel_copy.c b/src/mesa/drivers/dri/i915/intel_pixel_copy.c
index 9d478283e47bd4c60771ce3fd399cb2e8aa9e0fc..0bda2d863f32c84b4942d904b23fc0315eb34aa7 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/i915/intel_pixel_copy.c
@@ -54,9 +54,8 @@ copypix_src_region(struct intel_context *intel, GLenum type)
    case GL_DEPTH:
       /* Don't think this is really possible execpt at 16bpp, when we have no stencil.
        */
-      if (intel->intelScreen->depth_region && 
-         intel->intelScreen->depth_region->cpp == 2)
-         return intel->intelScreen->depth_region;
+      if (intel->depth_region && intel->depth_region->cpp == 2)
+         return intel->depth_region;
    case GL_STENCIL:
       /* Don't think this is really possible. 
        */
@@ -64,7 +63,7 @@ copypix_src_region(struct intel_context *intel, GLenum type)
    case GL_DEPTH_STENCIL_EXT:
       /* Does it matter whether it is stencil/depth or depth/stencil?
        */
-      return intel->intelScreen->depth_region;
+      return intel->depth_region;
    default:
       break;
    }
@@ -164,7 +163,7 @@ do_texture_copypixels(GLcontext * ctx,
 
    /* Set the 3d engine to draw into the destination region:
     */
-   intel->vtbl.meta_draw_region(intel, dst, intel->intelScreen->depth_region);
+   intel->vtbl.meta_draw_region(intel, dst, intel->depth_region);
 
    intel->vtbl.meta_import_pixel_state(intel);
 
@@ -342,8 +341,8 @@ do_blit_copypixels(GLcontext * ctx,
 
 
          intelEmitCopyBlit(intel, dst->cpp, 
-                          src->pitch, src->buffer, 0, 
-                          dst->pitch, dst->buffer, 0, 
+                          src->pitch, src->buffer, 0, src->tiled,
+                          dst->pitch, dst->buffer, 0, dst->tiled,
                           rect.x1 + delta_x, 
                           rect.y1 + delta_y,       /* srcx, srcy */
                            rect.x1, rect.y1,    /* dstx, dsty */