commit 5d232d53bb31b5a9408f2c3f20ddd41acc630951
author Frank Henigman <fjhenigman@chromium.org> Sun Apr 01 19:57:19 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Apr 03 17:19:36 2018 +0000
tree 80dad1b2419fee05d05f6bb295c8255df5a4b94e
parent 30b604d8d17480bd519fb97ec817db1e4ca90f0e

Fix conditions for updating element array buffer.

It was skipping elementArrayBufferOverride->onReadResource()
if mCurrentElementArrayBufferResource was null.

BUG=angleproject:2389

Change-Id: If33a11d35225daf572796abc8c18f6d6df758b48
Reviewed-on: https://chromium-review.googlesource.com/989408
Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
Reviewed-by: Luc Ferron <lucferron@chromium.org>

src/libANGLE/renderer/vulkan/VertexArrayVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
index bbc6895..e763e0a 100644
--- a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
+++ b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
@@ -187,15 +187,14 @@
     }
 
     // Handle the bound element array buffer.
-    if (drawType == DrawType::Elements && mCurrentElementArrayBufferResource)
+    if (drawType == DrawType::Elements)
     {
         if (elementArrayBufferOverride != nullptr)
         {
             elementArrayBufferOverride->onReadResource(readNode, serial);
         }
-        else
+        else if (mCurrentElementArrayBufferResource != nullptr)
         {
-            ASSERT(mCurrentElementArrayBufferResource);
             mCurrentElementArrayBufferResource->onReadResource(readNode, serial);
         }
     }