| commit | fcef3366e821db7ba7244a6a6829364b48527715 | [log] [tgz] |
|---|---|---|
| author | Jamie Madill <jmadill@chromium.org> | Wed Nov 13 19:37:19 2013 -0500 |
| committer | Jamie Madill <jmadill@chromium.org> | Wed Nov 13 19:37:19 2013 -0500 |
| tree | ac97a8c747959fb54c51ea9aceb4040ab48e4787 | |
| parent | c6a2dcf807551c27ea6df61dc4e4d1d36fa76b8c [diff] [blame] |
Fix bug with nested struct uniforms. TRAC #22875 Change-Id: I204cea18a710f6b9206a578a69f1dbc1e13fbd71 Signed-off-by: Shannon Woods Signed-off-by: Geoff Lang
diff --git a/src/libGLESv2/Uniform.cpp b/src/libGLESv2/Uniform.cpp index 77c6083..e85f2d0 100644 --- a/src/libGLESv2/Uniform.cpp +++ b/src/libGLESv2/Uniform.cpp
@@ -69,6 +69,7 @@ size_t Uniform::dataSize() const { + ASSERT(type != GL_STRUCT_ANGLEX); return UniformInternalSize(type) * elementCount(); }