Fix Static buffer invalidation regression

Bug=139 Trac=#15143 Signed-off-by: Daniel Koch Author: Michael Braithwaite git-svn-id: https://angleproject.googlecode.com/svn/trunk@712 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent b1762df4
#define MAJOR_VERSION 0 #define MAJOR_VERSION 0
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 710 #define BUILD_REVISION 712
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -139,8 +139,6 @@ GLenum VertexDataManager::prepareVertexData(GLint start, GLsizei count, Translat ...@@ -139,8 +139,6 @@ GLenum VertexDataManager::prepareVertexData(GLint start, GLsizei count, Translat
else if (staticBuffer->lookupAttribute(attribs[i]) == -1) else if (staticBuffer->lookupAttribute(attribs[i]) == -1)
{ {
// This static buffer doesn't have matching attributes, so fall back to using the streaming buffer // This static buffer doesn't have matching attributes, so fall back to using the streaming buffer
buffer->invalidateStaticData();
// Add the space of all previous attributes belonging to the invalidated static buffer to the streaming buffer // Add the space of all previous attributes belonging to the invalidated static buffer to the streaming buffer
for (int previous = 0; previous < i; previous++) for (int previous = 0; previous < i; previous++)
{ {
...@@ -157,6 +155,8 @@ GLenum VertexDataManager::prepareVertexData(GLint start, GLsizei count, Translat ...@@ -157,6 +155,8 @@ GLenum VertexDataManager::prepareVertexData(GLint start, GLsizei count, Translat
} }
mStreamingBuffer->addRequiredSpace(spaceRequired(attribs[i], count)); mStreamingBuffer->addRequiredSpace(spaceRequired(attribs[i], count));
buffer->invalidateStaticData();
} }
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment