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

Putting the bufmgr in the screen is not thread-safe since the emit_reloc
changes.  It also led to a significant performance hit from pthread usage
for the attempted thread-safety (up to 12% of a cpu spent on refcounting
protection in single-threaded 965).  The motivation had been to allow
multi-context bufmgr sharing in classic mode, but it wasn't worth the cost.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 44772e8588a..fd800a7bb68 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -222,7 +222,7 @@ try_pbo_upload(struct intel_context *intel,
    LOCK_HARDWARE(intel);
    {
       dri_bo *src_buffer = intel_bufferobj_buffer(intel, pbo, INTEL_READ);
-      dri_bo *dst_buffer = intel_region_buffer(intel->intelScreen,
+      dri_bo *dst_buffer = intel_region_buffer(intel,
 					       intelImage->mt->region,
 					       INTEL_WRITE_FULL);
 
@@ -280,7 +280,7 @@ try_pbo_zcopy(struct intel_context *intel,
       return GL_FALSE;
    }
 
-   intel_region_attach_pbo(intel->intelScreen, intelImage->mt->region, pbo);
+   intel_region_attach_pbo(intel, intelImage->mt->region, pbo);
 
    return GL_TRUE;
 }
@@ -459,7 +459,7 @@ intelTexImage(GLcontext * ctx,
 
 
    if (intelImage->mt)
-      intel_region_idle(intel->intelScreen, intelImage->mt->region);
+      intel_region_idle(intel, intelImage->mt->region);
 
    LOCK_HARDWARE(intel);