Check for null attribute buffers before binding.

Fixes: * Crash in conformance/extensions/oes-vertex-array-object.html BUG=angleproject:880 Change-Id: I90eba9b26b2834644ce3ba0e78cab3417c2a7bd1 Reviewed-on: https://chromium-review.googlesource.com/273325Tested-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Brandon Jones <bajones@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org>

Check for null attribute buffers before binding.
851cd580 · Geoff Lang · 4f1af784 · 851cd580
Commit 851cd580 authored May 26, 2015 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

VertexArrayGL.cpp src/libANGLE/renderer/gl/VertexArrayGL.cpp +9 -2

No files found.
--- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
@@ -209,8 +209,15 @@ gl::Error VertexArrayGL::syncAttributeState(bool attributesNeedStreaming, const 
            if (mAppliedAttributes[idx] != mAttributes[idx])
            {
                const gl::Buffer *arrayBuffer = mAttributes[idx].buffer.get();
-                const BufferGL *arrayBufferGL = GetImplAs<BufferGL>(arrayBuffer);
+                if (arrayBuffer != nullptr)
-                mStateManager->bindBuffer(GL_ARRAY_BUFFER, arrayBufferGL->getBufferID());
+                {
+                    const BufferGL *arrayBufferGL = GetImplAs<BufferGL>(arrayBuffer);
+                    mStateManager->bindBuffer(GL_ARRAY_BUFFER, arrayBufferGL->getBufferID());
+                }
+                else
+                {
+                    mStateManager->bindBuffer(GL_ARRAY_BUFFER, 0);
+                }
                if (mAttributes[idx].pureInteger)
                {