AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Fix assertion failure on gen6 BufferSubData to busy BO.

Browse Source 
Fixes fbo-blit and probably several other tests.
This commit is contained in:
Eric Anholt
2010-10-18 11:32:19 -07:00
parent 746e68c50b
commit 66800a04e5
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/intel/intel_buffer_objects.c
+17 -10
View File
@@ -214,21 +214,28 @@ intel_bufferobj_subdata(struct gl_context * ctx,
memcpy((char *)intel_obj->sys_buffer + offset, data, size);
else {
/* Flush any existing batchbuffer that might reference this data. */
if (drm_intel_bo_busy(intel_obj->buffer) ||
drm_intel_bo_references(intel->batch->buf, intel_obj->buffer)) {
drm_intel_bo *temp_bo;
if (intel->gen < 6) {
if (drm_intel_bo_busy(intel_obj->buffer) ||
drm_intel_bo_references(intel->batch->buf, intel_obj->buffer)) {
drm_intel_bo *temp_bo;
temp_bo = drm_intel_bo_alloc(intel->bufmgr, "subdata temp", size, 64);
temp_bo = drm_intel_bo_alloc(intel->bufmgr, "subdata temp", size, 64);
drm_intel_bo_subdata(temp_bo, 0, size, data);
drm_intel_bo_subdata(temp_bo, 0, size, data);
intel_emit_linear_blit(intel,
intel_obj->buffer, offset,
temp_bo, 0,
size);
intel_emit_linear_blit(intel,
intel_obj->buffer, offset,
temp_bo, 0,
size);
drm_intel_bo_unreference(temp_bo);
drm_intel_bo_unreference(temp_bo);
} else {
drm_intel_bo_subdata(intel_obj->buffer, offset, size, data);
}
} else {
if (drm_intel_bo_references(intel->batch->buf, intel_obj->buffer)) {
intel_batchbuffer_flush(intel->batch);
}
drm_intel_bo_subdata(intel_obj->buffer, offset, size, data);
}
}