Module: Mesa
Branch: mesa_7_5_branch
Commit: 126d62edd18f22ff9e744efea81e0383cd0a19c5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=126d62edd18f22ff9e744efea81e0383cd0a19c5
Author: Eric Anholt <e...@anholt.net>
Date: Thu Sep 24 20:03:21 2009 -0700
i915: Fix GetBufferSubData in the case of a system-memory BO.
Bug #23760 (crashes in wine)
---
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 2e6b778..db0de03 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -209,7 +209,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);
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
