commit 8f1b0ee56c2df7705eb007bec87bd9fefc0ee36c
author Alexis Hetu <sugoi@google.com> Mon Jun 08 16:22:57 2015 -0400
committer Alexis Hétu <sugoi@google.com> Mon Jun 08 20:37:36 2015 +0000
tree b4f5aa7a49469e3103490de402259fc708391593
parent dd8df68e64365aafe91893b11bf7cc4b67599ed4

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/3430
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>

src/OpenGL/libGLESv2/VertexDataManager.cpp

diff --git a/src/OpenGL/libGLESv2/VertexDataManager.cpp b/src/OpenGL/libGLESv2/VertexDataManager.cpp
index 8d69d65..6729c20 100644
--- a/src/OpenGL/libGLESv2/VertexDataManager.cpp
+++ b/src/OpenGL/libGLESv2/VertexDataManager.cpp
@@ -128,7 +128,8 @@
         {

             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 @@
                 }

                 else

                 {

-                    unsigned int streamOffset = writeAttributeData(mStreamingBuffer, firstVertexIndex, count, attrib);

+                    unsigned int streamOffset = writeAttributeData(mStreamingBuffer, firstVertexIndex, isInstanced ? 1 : count, attrib);

 

 					if(streamOffset == -1)

 					{