Buffer11: Cleanup onCopyStorage.

BUG=angleproject:1155 Change-Id: I7bc5c196d10ae040487ecd1137d9b18c3000775a Reviewed-on: https://chromium-review.googlesource.com/769730Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Buffer11: Cleanup onCopyStorage.
fea1e754 · Jamie Madill · Commit Bot · 08943afd · fea1e754
Commit fea1e754 authored Nov 14, 2017 by Jamie Madill Committed by Commit Bot Nov 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Buffer11.cpp src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp +4 -2

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
@@ -929,9 +929,11 @@ OnBufferDataDirtyChannel *Buffer11::getDirectBroadcastChannel()
 void Buffer11::onCopyStorage(BufferStorage *dest, BufferStorage *source)
 {
-    ASSERT(source);
+    ASSERT(source && mLatestBufferStorage);
    dest->setDataRevision(source->getDataRevision());
-    if (!mLatestBufferStorage || dest->getUsage() < mLatestBufferStorage->getUsage())
+    // Only update the latest buffer storage if our usage index is lower. See comment in header.
+    if (dest->getUsage() < mLatestBufferStorage->getUsage())
    {
        mLatestBufferStorage = dest;
    }