diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-28 09:59:59 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-28 09:59:59 -0600 |
| commit | eeb7e04da64fdae3a40b1afdcde71dcded2481f3 (patch) | |
| tree | d968a71505b92c86a78b435f72752884a9435f92 /src/mesa/drivers | |
| parent | 151e0c0aeaa78f4eb6a87d2b3dd86b4807db1523 (diff) | |
| parent | d09941c8cc2d4620eb774744c8878921b9dc3bcc (diff) | |
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_buffer_objects.c | 5 |
1 files changed, 4 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 7f6fb66d52..a0225936c8 100644 --- 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); } |