diff options
| author | Eric Anholt <eric@anholt.net> | 2009-09-24 16:15:52 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-09-24 16:24:46 -0700 |
| commit | cc8084932cc552587e3036dbbf62c77db3b4a08e (patch) | |
| tree | 94c79bc5258b4237092420cf23a0f2288187e993 | |
| parent | 54107a097904129ff794534542acd09ed152ea2e (diff) | |
intel: Flush the batch when we're about to subdata into a VBO.mesa_7_6_rc1
This fixes the clears in openarena with the new metaops clear code, and
the new piglit vbo-subdata-sync test.
Bug #23857.
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_buffer_objects.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_clear.c | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c index c55c5c426e..7f6fb66d52 100644 --- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c @@ -207,8 +207,12 @@ intel_bufferobj_subdata(GLcontext * ctx, if (intel_obj->sys_buffer) memcpy((char *)intel_obj->sys_buffer + offset, data, size); - else + else { + /* Flush any existing batchbuffer that might reference this data. */ + intelFlush(ctx); + dri_bo_subdata(intel_obj->buffer, offset, size, data); + } } diff --git a/src/mesa/drivers/dri/intel/intel_clear.c b/src/mesa/drivers/dri/intel/intel_clear.c index 9010b910c7..1b0e221789 100644 --- a/src/mesa/drivers/dri/intel/intel_clear.c +++ b/src/mesa/drivers/dri/intel/intel_clear.c @@ -173,7 +173,6 @@ intelClear(GLcontext *ctx, GLbitfield mask) } _mesa_meta_clear(&intel->ctx, tri_mask); - intel_batchbuffer_flush(intel->batch); } if (swrast_mask) { |