Fixed an issue with Streaming Vertex data overflowing it's buffer.

Bug=angle:689 Change-Id: Ia0ee6f951822901560888ea300a3889601fa1d89 Reviewed-on: https://chromium-review.googlesource.com/207010Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Brandon Jones <bajones@chromium.org>

Fixed an issue with Streaming Vertex data overflowing it's buffer.
b23375fe · Brandon Jones · aa7e1660 · b23375fe
Commit b23375fe authored Jul 08, 2014 by Brandon Jones
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

VertexDataManager.cpp src/libGLESv2/renderer/d3d/VertexDataManager.cpp +2 -5

No files found.
--- a/src/libGLESv2/renderer/d3d/VertexDataManager.cpp
+++ b/src/libGLESv2/renderer/d3d/VertexDataManager.cpp
@@ -124,10 +124,8 @@ GLenum VertexDataManager::prepareVertexData(const gl::VertexAttribute attribs[],
        if (translated[i].active && attribs[i].enabled)
        {
            gl::Buffer *buffer = attribs[i].buffer.get();
-            if (buffer)
+            BufferD3D *bufferImpl = buffer ? BufferD3D::makeBufferD3D(buffer->getImplementation()) : NULL;
-            {
+            StaticVertexBufferInterface *staticBuffer = bufferImpl ? bufferImpl->getStaticVertexBuffer() : NULL;
-                BufferD3D *bufferImpl = BufferD3D::makeBufferD3D(buffer->getImplementation());
-                StaticVertexBufferInterface *staticBuffer = bufferImpl->getStaticVertexBuffer();
            VertexBufferInterface *vertexBuffer = staticBuffer ? staticBuffer : static_cast<VertexBufferInterface*>(mStreamingBuffer);
            if (!vertexBuffer->directStoragePossible(attribs[i], currentValues[i]))
@@ -162,7 +160,6 @@ GLenum VertexDataManager::prepareVertexData(const gl::VertexAttribute attribs[],
            }
        }
    }
-    }
    // Perform the vertex data translations
    for (int i = 0; i < gl::MAX_VERTEX_ATTRIBS; i++)