Fix EGL shim extension injection for GL ES 3 drivers.
The Android EGL shim injects GL_EXT_debug_marker into the ES driver
EXTENSIONS string for the OpenGL ES 1.x and 2.0/3.0/3.1 drivers if
the extension is not already provided. This feature is used by
GLES_trace.
In Open GL ES 3.0 it became possible to query an indexed version of
the EXTENSIONS string via GetStringi(). NUM_EXTENSIONS Gets were
also added to the specification (taken from Open GL).
If the shim does not have to inject the extension, then there is no
problem, as glGetString() and glGetStringi() / NUM_EXTENSIONS will
be consistent. However, if the Android EGL shim injects the
extension, NUM_EXTENSIONS and GetStringi() will report one less
extension than is really available.
Consistency between these methods is tested by the dEQP framework
with the dEQP-GLES3.functional.state_query.string.extensions test.
If the driver does not provide GL_EXT_debug_marker, this test
fails.
This change wraps all of the affected entry points so that the
wrapped driver extensions are never visible directly to dEQP,
eliminating the inconsistency.
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index 7c70fa0..4e0e5bc 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -292,6 +292,44 @@
return (const GLubyte *)c->gl_extensions.string();
}
+const GLubyte * egl_get_string_for_current_context(GLenum name, GLuint index) {
+ // NOTE: returning NULL here will fall-back to the default
+ // implementation.
+
+ EGLContext context = egl_tls_t::getContext();
+ if (context == EGL_NO_CONTEXT)
+ return NULL;
+
+ egl_context_t const * const c = get_context(context);
+ if (c == NULL) // this should never happen, by construction
+ return NULL;
+
+ if (name != GL_EXTENSIONS)
+ return NULL;
+
+ // if index is out of bounds, assume it will be in the default
+ // implementation too, so we don't have to generate a GL error here
+ if (index >= c->tokenized_gl_extensions.size())
+ return NULL;
+
+ return (const GLubyte *)c->tokenized_gl_extensions.itemAt(index).string();
+}
+
+GLint egl_get_num_extensions_for_current_context() {
+ // NOTE: returning -1 here will fall-back to the default
+ // implementation.
+
+ EGLContext context = egl_tls_t::getContext();
+ if (context == EGL_NO_CONTEXT)
+ return -1;
+
+ egl_context_t const * const c = get_context(context);
+ if (c == NULL) // this should never happen, by construction
+ return -1;
+
+ return (GLint)c->tokenized_gl_extensions.size();
+}
+
// ----------------------------------------------------------------------------
// this mutex protects:
diff --git a/opengl/libs/EGL/egl_object.cpp b/opengl/libs/EGL/egl_object.cpp
index d3ee76d..d511940 100644
--- a/opengl/libs/EGL/egl_object.cpp
+++ b/opengl/libs/EGL/egl_object.cpp
@@ -113,6 +113,18 @@
temp.append(gl_extensions);
gl_extensions.setTo(temp);
}
+
+ // tokenize the supported extensions for the glGetStringi() wrapper
+ exts = gl_extensions.string();
+ while (1) {
+ const char *end = strchr(exts, ' ');
+ if (end == NULL) {
+ tokenized_gl_extensions.push(String8(exts));
+ break;
+ }
+ tokenized_gl_extensions.push(String8(exts, end - exts));
+ exts = end + 1;
+ }
}
}
diff --git a/opengl/libs/EGL/egl_object.h b/opengl/libs/EGL/egl_object.h
index 518fdec..f5a9f58 100644
--- a/opengl/libs/EGL/egl_object.h
+++ b/opengl/libs/EGL/egl_object.h
@@ -27,6 +27,7 @@
#include <utils/threads.h>
#include <utils/String8.h>
+#include <utils/Vector.h>
#include <system/window.h>
@@ -159,6 +160,7 @@
egl_connection_t const* cnx;
int version;
String8 gl_extensions;
+ Vector<String8> tokenized_gl_extensions;
};
// ----------------------------------------------------------------------------