summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/nine/buffer9.c
diff options
context:
space:
mode:
authorAxel Davy <axel.davy@ens.fr>2016-02-24 23:44:40 +0100
committerAxel Davy <axel.davy@ens.fr>2016-02-29 18:55:58 +0100
commit35c858c42c818d5bf5b4bfee03a342df52acface (patch)
tree3c06ab112c903b1e0b90f73bfda79ca74f0b8697 /src/gallium/state_trackers/nine/buffer9.c
parent8a8affdfdace486f4e416e66e2dd0ed122505a90 (diff)
downloadexternal_mesa3d-35c858c42c818d5bf5b4bfee03a342df52acface.zip
external_mesa3d-35c858c42c818d5bf5b4bfee03a342df52acface.tar.gz
external_mesa3d-35c858c42c818d5bf5b4bfee03a342df52acface.tar.bz2
st/nine: Handle READONLY for buffer MANAGED pool
READONLY won't trigger an upload. Cc: "11.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Axel Davy <axel.davy@ens.fr>
Diffstat (limited to 'src/gallium/state_trackers/nine/buffer9.c')
-rw-r--r--src/gallium/state_trackers/nine/buffer9.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/gallium/state_trackers/nine/buffer9.c b/src/gallium/state_trackers/nine/buffer9.c
index e066fc5..8efb4ce 100644
--- a/src/gallium/state_trackers/nine/buffer9.c
+++ b/src/gallium/state_trackers/nine/buffer9.c
@@ -174,13 +174,16 @@ NineBuffer9_Lock( struct NineBuffer9 *This,
u_box_1d(OffsetToLock, SizeToLock, &box);
if (This->base.pool == D3DPOOL_MANAGED) {
- if (!This->managed.dirty) {
- assert(LIST_IS_EMPTY(&This->managed.list));
- list_add(&This->managed.list, &This->base.base.device->update_buffers);
- This->managed.dirty = TRUE;
- This->managed.dirty_box = box;
- } else {
- u_box_union_2d(&This->managed.dirty_box, &This->managed.dirty_box, &box);
+ /* READONLY doesn't dirty the buffer */
+ if (!(Flags & D3DLOCK_READONLY)) {
+ if (!This->managed.dirty) {
+ assert(LIST_IS_EMPTY(&This->managed.list));
+ list_add(&This->managed.list, &This->base.base.device->update_buffers);
+ This->managed.dirty = TRUE;
+ This->managed.dirty_box = box;
+ } else {
+ u_box_union_2d(&This->managed.dirty_box, &This->managed.dirty_box, &box);
+ }
}
*ppbData = (char *)This->managed.data + OffsetToLock;
DBG("returning pointer %p\n", *ppbData);