commit 18319182b4acdad574568a0b2dfe21ee66ea12cc
author John Bauman <jbauman@chromium.org> Wed Sep 28 14:22:27 2016 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Oct 05 00:22:32 2016 +0000
tree ddff7dbc4e83102ab3d990fe814bfd118512cf9e
parent 7f9a55f73015cc62b7ff63513c52e8720cfff66e

Re-land "Fix glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, ...)"

BUG=angleproject:1332

Change-Id: Ie970466c4528cb80b2363d0c0683da2d9c23c4f4
Reviewed-on: https://chromium-review.googlesource.com/392267
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;