diff options
| author | Eric Anholt <[email protected]> | 2012-07-05 13:43:43 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-07-11 09:20:21 -0700 |
| commit | f9b3e257d19587f4b9fae31610df857b10d69d1b (patch) | |
| tree | 19ee4f59f851073abd2068cc553e60c017176fdd | |
| parent | b5c037f6b1cd54f72c3575c33adb2bcdaae678d7 (diff) | |
i965: Revert the VBOs-in-system-memory hack.
It didn't change performance on Lightsmark or Nexuiz, which both used
DYNAMIC_DRAW buffers, but it was killing performance (40% CPU wasted pwriting
buffers) on a closed-source app we're looking at.
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_buffer_objects.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c index d2a07097688..ef511e6a34e 100644 --- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c @@ -140,15 +140,11 @@ intel_bufferobj_data(struct gl_context * ctx, intel_obj->sys_buffer = NULL; if (size != 0) { - if (usage == GL_DYNAMIC_DRAW #ifdef I915 - /* On pre-965, stick VBOs in system memory, as we're always doing - * swtnl with their contents anyway. - */ - || target == GL_ARRAY_BUFFER || target == GL_ELEMENT_ARRAY_BUFFER -#endif - ) - { + /* On pre-965, stick VBOs in system memory, as we're always doing + * swtnl with their contents anyway. + */ + if (target == GL_ARRAY_BUFFER || target == GL_ELEMENT_ARRAY_BUFFER) { intel_obj->sys_buffer = malloc(size); if (intel_obj->sys_buffer != NULL) { if (data != NULL) @@ -156,6 +152,7 @@ intel_bufferobj_data(struct gl_context * ctx, return true; } } +#endif intel_bufferobj_alloc_buffer(intel, intel_obj); if (!intel_obj->buffer) return false; |