Use MapBufferRangeWithFallback in VertexArrayGL::streamAttributes

Otherwise, end2end tests crash on Nexus 5X, because Adreno driver doesn't provide glMapBuffer. BUG=angleproject:1362 TEST=angle_end2end_tests on Nexus 5X and Linux Change-Id: I6207eca2d0e03eee957bb612271a66016fd562bb Reviewed-on: https://chromium-review.googlesource.com/349421Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Use MapBufferRangeWithFallback in VertexArrayGL::streamAttributes
c88d8354 · Yuly Novikov · Commit Bot · 27b96979 · c88d8354
Commit c88d8354 authored Jun 02, 2016 by Yuly Novikov Committed by Commit Bot Jun 06, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

VertexArrayGL.cpp src/libANGLE/renderer/gl/VertexArrayGL.cpp +3 -1

No files found.
--- 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 @@ gl::Error VertexArrayGL::streamAttributes(const gl::AttributesMask &activeAttrib
    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();