From: Eric Anholt <eric@anholt.net>
Date: Mon, 18 Oct 2010 21:12:12 +0000 (-0700)
Subject: i965: Avoid blits in BufferCopySubdata on gen6.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4af293741635aea8630e8734a8b4caf58047e91d;p=mesa.git

i965: Avoid blits in BufferCopySubdata on gen6.

Fixes glean/bufferObject.
---

diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index fea99b2ad60..87da60a771e 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -559,7 +559,7 @@ intel_bufferobj_copy_subdata(struct gl_context *ctx,
       return;
 
    /* If we're in system memory, just map and memcpy. */
-   if (intel_src->sys_buffer || intel_dst->sys_buffer) {
+   if (intel_src->sys_buffer || intel_dst->sys_buffer || intel->gen >= 6) {
       /* The same buffer may be used, but note that regions copied may
        * not overlap.
        */
@@ -582,6 +582,7 @@ intel_bufferobj_copy_subdata(struct gl_context *ctx,
 	 intel_bufferobj_unmap(ctx, GL_COPY_READ_BUFFER, src);
 	 intel_bufferobj_unmap(ctx, GL_COPY_WRITE_BUFFER, dst);
       }
+      return;
    }
 
    /* Otherwise, we have real BOs, so blit them. */