commit ca40662aa81f7735d3510fa52e55d28503c7f9ec
author John Bauman <jbauman@chromium.org> Wed Sep 28 14:22:27 2016 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Sep 29 23:32:22 2016 +0000
tree 25dd474d811303c99ed954a9bdda9328b0c72b8c
parent ff5b2d5128f502927486e427e64032cfa1901d59

Fix glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, ...)

BUG=angleproject:1332

Change-Id: I591b9520bc1122eb6232803ac86b6d0322f8c349
Reviewed-on: https://chromium-review.googlesource.com/390323
Commit-Queue: John Bauman <jbauman@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 4521be5..fff9088 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -1735,10 +1735,12 @@
       case GL_TEXTURE_BINDING_2D_ARRAY:
         break;
       case GL_TEXTURE_BINDING_EXTERNAL_OES:
-          if (!context->getExtensions().eglStreamConsumerExternal)
+          if (!context->getExtensions().eglStreamConsumerExternal &&
+              !context->getExtensions().eglImageExternal)
           {
-              context->handleError(
-                  Error(GL_INVALID_ENUM, "NV_EGL_stream_consumer_external extension not enabled"));
+              context->handleError(Error(GL_INVALID_ENUM,
+                                         "Neither NV_EGL_stream_consumer_external nor "
+                                         "GL_OES_EGL_image_external extensions enabled"));
               return false;
           }
           break;