commit 5d124a69b6935285230956117aa839aee4dcdd36
author Geoff Lang <geofflang@chromium.org> Tue Sep 15 13:03:27 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Thu Oct 01 18:29:32 2015 +0000
tree eec310c98b10aa57a6ff2d6b6f076d061caa2c92
parent cf2dbd9133ec79882865e709f8a75800ee84f06b

Support UBOs in RendererGL and ProgramGL.

Reland: fix compile warnings on Windows.

BUG=angleproject:882
BUG=angleproject:883

Change-Id: If4844d50d43ff9b765f64606e8f08d65a1afd9a4
Reviewed-on: https://chromium-review.googlesource.com/303431
Tryjob-Request: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/Program.cpp

diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
index 14a50ba..13277b3 100644
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -1520,6 +1520,7 @@
 void Program::bindUniformBlock(GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
     mData.mUniformBlockBindings[uniformBlockIndex] = uniformBlockBinding;
+    mProgram->setUniformBlockBinding(uniformBlockIndex, uniformBlockBinding);
 }
 
 GLuint Program::getUniformBlockBinding(GLuint uniformBlockIndex) const
@@ -1533,6 +1534,7 @@
     {
         mData.mUniformBlockBindings[blockId] = 0;
     }
+    mData.mActiveUniformBlockBindings.reset();
 }
 
 void Program::setTransformFeedbackVaryings(GLsizei count, const GLchar *const *varyings, GLenum bufferMode)