Mesa (master): intel: Re-allow blitting glCopyBufferSubData() on gen >= 6.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 43f12e5eb8dbbe57344188ab7cacab8c7fe91da1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=43f12e5eb8dbbe57344188ab7cacab8c7fe91da1

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 27 17:16:10 2011 -0800

intel: Re-allow blitting glCopyBufferSubData() on gen >= 6.

This was disabled a year ago due to not having a story for handling
the blitter at the time.  We're fine with using the blitter now.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/intel/intel_buffer_objects.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index 9b1f642..03dd179 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -657,7 +657,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 || intel->gen >= 6) {
+   if (intel_src->sys_buffer || intel_dst->sys_buffer) {
       /* The same buffer may be used, but note that regions copied may
        * not overlap.
        */