Revert "Fix glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, ...)"

This reverts commit ca40662a. https://chromium.googlesource.com/angle/angle/+/ca40662aa81f7735d3510fa52e55d28503c7f9ec broke angle_end2end_tests on the Win Debug bots. Examples: https://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Debug%20%28NVIDIA%29/builds/18718 https://build.chromium.org/p/chromium.gpu.fyi/builders/Win8%20Debug%20%28NVIDIA%29/builds/15905 Tests failing: Texture2DTest.QueryBinding/ES2_D3D11 Texture2DTest.QueryBinding/ES2_D3D9 Texture2DTest.QueryBinding/ES2_D3D11_9_3 Change-Id: If9da864f49e0de3a134d43ae36c2a99e9b5a2a53 Reviewed-on: https://chromium-review.googlesource.com/391130Reviewed-by: John Bauman <jbauman@chromium.org>

Revert "Fix glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, ...)"
5dc37d05 · John Bauman · 389dc9d4 · 5dc37d05 · 5dc37d05 · 5dc37d05
Commit 5dc37d05 authored Oct 01, 2016 by John Bauman
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 37 deletions

ContextState.cpp src/libANGLE/ContextState.cpp +0 -8

validationES.cpp src/libANGLE/validationES.cpp +3 -5

TextureTest.cpp src/tests/gl_tests/TextureTest.cpp +0 -24

No files found.
--- a/src/libANGLE/ContextState.cpp
+++ b/src/libANGLE/ContextState.cpp
@@ -278,14 +278,6 @@ bool ValidationContext::getQueryParameterInfo(GLenum pname, GLenum *type, unsign
            *type      = GL_INT;
            *numParams = 1;
            return true;
-        case GL_TEXTURE_BINDING_EXTERNAL_OES:
-            if (!getExtensions().eglStreamConsumerExternal && !getExtensions().eglImageExternal)
-            {
-                return false;
-            }
-            *type      = GL_INT;
-            *numParams = 1;
-            return true;
    }
    if (getExtensions().debug)

--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -1735,12 +1735,10 @@ bool ValidateStateQuery(ValidationContext *context,
      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,
+              context->handleError(
-                                         "Neither NV_EGL_stream_consumer_external nor "
+                  Error(GL_INVALID_ENUM, "NV_EGL_stream_consumer_external extension not enabled"));
-                                         "GL_OES_EGL_image_external extensions enabled"));
              return false;
          }
          break;

--- a/src/tests/gl_tests/TextureTest.cpp
+++ b/src/tests/gl_tests/TextureTest.cpp
@@ -1196,30 +1196,6 @@ TEST_P(Texture2DTest, NegativeAPISubImage)
    EXPECT_GL_ERROR(GL_INVALID_VALUE);
 }
-// Test that querying GL_TEXTURE_BINDING* doesn't cause an unexpected error.
-TEST_P(Texture2DTest, QueryBinding)
-{
-    glBindTexture(GL_TEXTURE_2D, 0);
-    EXPECT_GL_ERROR(GL_NO_ERROR);
-    GLint textureBinding;
-    glGetIntegerv(GL_TEXTURE_BINDING_2D, &textureBinding);
-    EXPECT_GL_NO_ERROR();
-    EXPECT_EQ(0, textureBinding);
-    glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, &textureBinding);
-    if (extensionEnabled("GL_OES_EGL_image_external") ||
-        extensionEnabled("GL_NV_EGL_stream_consumer_external"))
-    {
-        EXPECT_GL_NO_ERROR();
-        EXPECT_EQ(0, textureBinding);
-    }
-    else
-    {
-        EXPECT_GL_ERROR(GL_INVALID_ENUM);
-    }
-}
 TEST_P(Texture2DTest, ZeroSizedUploads)
 {
    glBindTexture(GL_TEXTURE_2D, mTexture2D);