commit dc43a6c99c21e99723058bab4041e80557795a74
author Romain Guy <romainguy@google.com> Fri Feb 17 19:54:25 2017 -0800
committer Romain Guy <romainguy@google.com> Sat Feb 18 17:34:28 2017 -0800
tree a2f8577f083bfbd8e3a1199c3b9a0656d90dfec5
parent ed71756327a57a301ea7a2b6d6041517320ab3ad

Add missing GLES 3.x metadata

Prevent a crash when glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS) returns 0

Bug: 33106868
Test: Manual test app
Change-Id: If843b99efe5498f88ec10e1bd2b2819a01983864

core/jni/android_opengl_GLES30.cpp

diff --git a/core/jni/android_opengl_GLES30.cpp b/core/jni/android_opengl_GLES30.cpp
index 736fd99..1d12b0a 100644
--- a/core/jni/android_opengl_GLES30.cpp
+++ b/core/jni/android_opengl_GLES30.cpp
@@ -272,6 +272,19 @@
  */
 static int getNeededCount(GLint pname) {
     int needed = 1;
+#ifdef GL_ES_VERSION_3_0
+    // GLES 3.x pnames
+    switch (pname) {
+        case GL_MAX_VIEWPORT_DIMS:
+            needed = 2;
+            break;
+
+        case GL_PROGRAM_BINARY_FORMATS:
+            glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &needed);
+            break;
+    }
+#endif
+
 #ifdef GL_ES_VERSION_2_0
     // GLES 2.x pnames
     switch (pname) {