commit b2ebb5e81f19b0f4f9f28ff300850f4805651748
author Geoff Lang <geofflang@chromium.org> Wed Jun 08 18:17:55 2016 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Jun 08 20:57:07 2016 +0000
tree e21b5bc123e917a8e97835852b22164fe8ca46e5
parent 4b4cdff894f412ad54fc53e24de3edbf5b25c07c

Revert "Revert "Use MapBufferRangeWithFallback in VertexArrayGL::streamAttributes""

This reverts commit 8b8d043205a69802be7579bd90798162f34740b2.

Change-Id: I25726642d066ca322830d1f5a4327f4e7e551fa6
Reviewed-on: https://chromium-review.googlesource.com/350870
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/gl/VertexArrayGL.cpp

diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
index 5f5b032..1e7fa03 100644
--- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
@@ -17,6 +17,7 @@
 #include "libANGLE/formatutils.h"
 #include "libANGLE/renderer/gl/BufferGL.h"
 #include "libANGLE/renderer/gl/FunctionsGL.h"
+#include "libANGLE/renderer/gl/renderergl_utils.h"
 #include "libANGLE/renderer/gl/StateManagerGL.h"
 
 using namespace gl;
@@ -288,7 +289,8 @@
     size_t unmapRetryAttempts = 5;
     while (unmapResult != GL_TRUE && --unmapRetryAttempts > 0)
     {
-        uint8_t *bufferPointer = reinterpret_cast<uint8_t*>(mFunctions->mapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY));
+        uint8_t *bufferPointer = MapBufferRangeWithFallback(mFunctions, GL_ARRAY_BUFFER, 0,
+                                                            requiredBufferSize, GL_MAP_WRITE_BIT);
         size_t curBufferOffset = bufferEmptySpace;
 
         const auto &attribs = mData.getVertexAttributes();