Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-28 09:59:59 -06:00
parent 151e0c0aea d09941c8cc
commit eeb7e04da6
6 changed files with 115 additions and 56 deletions
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -229,7 +229,10 @@ intel_bufferobj_get_subdata(GLcontext * ctx,
   struct intel_buffer_object *intel_obj = intel_buffer_object(obj);

   assert(intel_obj);
-   dri_bo_get_subdata(intel_obj->buffer, offset, size, data);
+   if (intel_obj->sys_buffer)
+      memcpy(data, (char *)intel_obj->sys_buffer + offset, size);
+   else
+      dri_bo_get_subdata(intel_obj->buffer, offset, size, data);
 }