commit 2eb65034db7115f7cce46e119a6ac0c99f8d1584
author Jamie Madill <jmadill@chromium.org> Mon Jul 30 10:25:57 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Jul 31 15:21:23 2018 +0000
tree e414b98ea02c3ad5b00660a076a8bd5535bb120b
parent 67c388e6c04ec35da3c72dd5fb3275a189c99fd1

Add Context::getActiveBufferedAttribsMask.

This will enable more caching for ValidateDrawAttribs. It requires some
minor refactoring of the GLES 1 code.

Bug: angleproject:1391
Change-Id: I52b73c9384d14cdb90ba6337bfc1ab345866fff0
Reviewed-on: https://chromium-review.googlesource.com/1147436
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 1bdd2bb..15c44e8 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -7531,6 +7531,28 @@
     mGLState.setMaxShaderCompilerThreads(count);
 }
 
+bool Context::isGLES1() const
+{
+    return mState.getClientVersion() < Version(2, 0);
+}
+
+AttributesMask Context::getActiveBufferedAttribsMask() const
+{
+    // TODO(jmadill): Cache this. http://anglebug.com/1391
+    ASSERT(mGLState.getProgram() || isGLES1());
+
+    const AttributesMask &activeAttribs =
+        isGLES1() ? mGLState.gles1().getVertexArraysAttributeMask()
+                  : mGLState.getProgram()->getActiveAttribLocationsMask();
+
+    const VertexArray *vao = mGLState.getVertexArray();
+    ASSERT(vao);
+
+    const AttributesMask &clientAttribs = vao->getEnabledClientMemoryAttribsMask();
+
+    return (activeAttribs & vao->getEnabledAttributesMask() & ~clientAttribs);
+}
+
 // ErrorSet implementation.
 ErrorSet::ErrorSet(Context *context) : mContext(context)
 {