Fixed instanced rendering

Instanced rendering only requires a single attribute per instance, which was handled properly everywhere except in the streaming buffer, so that had to be fixed. All related dEQP tests pass. Change-Id: I9b9bd6cd790dfe7ecf7f5d2ed84623bfa4da4b6f Reviewed-on: https://swiftshader-review.googlesource.com/3430Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Alexis Hétu <sugoi@google.com>

Fixed instanced rendering
8f1b0ee5 · Alexis Hetu · Alexis Hétu · dd8df68e · 8f1b0ee5
Commit 8f1b0ee5 authored Jun 08, 2015 by Alexis Hetu Committed by Alexis Hétu Jun 08, 2015
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

VertexDataManager.cpp src/OpenGL/libGLESv2/VertexDataManager.cpp +3 -2

No files found.
--- a/src/OpenGL/libGLESv2/VertexDataManager.cpp
+++ b/src/OpenGL/libGLESv2/VertexDataManager.cpp
@@ -128,7 +128,8 @@ GLenum VertexDataManager::prepareVertexData(GLint start, GLsizei count, Translat
        {
            if(!attrib.mBoundBuffer)
            {
-                mStreamingBuffer->addRequiredSpace(attrib.typeSize() * count);
+                const bool isInstanced = attrib.mDivisor > 0;
+                mStreamingBuffer->addRequiredSpace(attrib.typeSize() * (isInstanced ? 1 : count));
            }
        }
    }
@@ -168,7 +169,7 @@ GLenum VertexDataManager::prepareVertexData(GLint start, GLsizei count, Translat
                }
                else
                {
-                    unsigned int streamOffset = writeAttributeData(mStreamingBuffer, firstVertexIndex, count, attrib);
+                    unsigned int streamOffset = writeAttributeData(mStreamingBuffer, firstVertexIndex, isInstanced ? 1 : count, attrib);
 					if(streamOffset == -1)
 					{