commit 9670b03eb082fe0184c4e3222daa517afc1389c1
author Corentin Wallez <cwallez@chromium.org> Fri Apr 29 09:47:47 2016 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Apr 29 11:45:12 2016 +0000
tree 3fccd31f869f942870a56e9084f2da7757a315f2
parent 9082b982b9c377384563d85dafa24ad717cd58c5

Revert "Finish NV12 support via streams."

Broke Windows Clang compilation, see https://build.chromium.org/p/chromium.gpu.fyi/builders/GPU%20Win%20Clang%20Builder%20%28dbg%29/builds/3583/steps/compile/logs/stdio and search for TextureStorage11.h

This reverts commit 9b8b359fa3615be7c7492239a48f61103b2e4fcc.

Change-Id: I6e54305eba02b40927a35577594df39e951adb32
Reviewed-on: https://chromium-review.googlesource.com/341430
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 6ea31bf..7f6e915 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -169,15 +169,6 @@
     }
 }
 
-// Most texture GL calls are not compatible with external textures, so we have a separate validation
-// function for use in the GL calls that do
-bool ValidTextureExternalTarget(const ValidationContext *context, GLenum target)
-{
-    return (target == GL_TEXTURE_EXTERNAL_OES) &&
-           (context->getExtensions().eglImageExternal ||
-            context->getExtensions().eglStreamConsumerExternal);
-}
-
 // This function differs from ValidTextureTarget in that the target must be
 // usable as the destination of a 2D operation-- so a cube face is valid, but
 // GL_TEXTURE_CUBE_MAP is not.
@@ -834,7 +825,7 @@
     }
 }
 
-bool ValidateTexParamParameters(gl::Context *context, GLenum target, GLenum pname, GLint param)
+bool ValidateTexParamParameters(gl::Context *context, GLenum pname, GLint param)
 {
     switch (pname)
     {
@@ -849,9 +840,7 @@
       case GL_TEXTURE_COMPARE_FUNC:
       case GL_TEXTURE_MIN_LOD:
       case GL_TEXTURE_MAX_LOD:
-          // ES3 texture paramters are not supported on external textures as the extension is
-          // written against ES2.
-          if (context->getClientVersion() < 3 || target == GL_TEXTURE_EXTERNAL_OES)
+        if (context->getClientVersion() < 3)
         {
             context->recordError(Error(GL_INVALID_ENUM));
             return false;
@@ -868,11 +857,10 @@
       case GL_TEXTURE_WRAP_R:
         switch (param)
         {
-          case GL_CLAMP_TO_EDGE:
-              return true;
           case GL_REPEAT:
+          case GL_CLAMP_TO_EDGE:
           case GL_MIRRORED_REPEAT:
-              return (target != GL_TEXTURE_EXTERNAL_OES);
+            return true;
           default:
             context->recordError(Error(GL_INVALID_ENUM));
             return false;
@@ -883,12 +871,11 @@
         {
           case GL_NEAREST:
           case GL_LINEAR:
-              return true;
           case GL_NEAREST_MIPMAP_NEAREST:
           case GL_LINEAR_MIPMAP_NEAREST:
           case GL_NEAREST_MIPMAP_LINEAR:
           case GL_LINEAR_MIPMAP_LINEAR:
-              return (target != GL_TEXTURE_EXTERNAL_OES);
+            return true;
           default:
             context->recordError(Error(GL_INVALID_ENUM));
             return false;