Add missing errors specified by OES_EGL_image_external

Previously the code just silently ignored some filtering parameters for external textures, when in fact trying to set them should result in an error according to the extension specs. BUG=angleproject:1332 Change-Id: I3a691b60561638c562bc1a9780a4dcb88ac43012 Reviewed-on: https://chromium-review.googlesource.com/341441Reviewed-by: Ian Ewell <ewell@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Add missing errors specified by OES_EGL_image_external
bd329091 · Olli Etuaho · Commit Bot · 2be8c8cc · bd329091
Commit bd329091 authored Apr 29, 2016 by Olli Etuaho Committed by Commit Bot May 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 2 deletions

validationES.cpp src/libANGLE/validationES.cpp +17 -2

No files found.
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -872,7 +872,14 @@ bool ValidateTexParamParameters(gl::Context *context, GLenum target, GLenum pnam
              return true;
          case GL_REPEAT:
          case GL_MIRRORED_REPEAT:
-              return (target != GL_TEXTURE_EXTERNAL_OES);
+              if (target == GL_TEXTURE_EXTERNAL_OES)
+              {
+                  // OES_EGL_image_external specifies this error.
+                  context->recordError(Error(
+                      GL_INVALID_ENUM, "external textures only support CLAMP_TO_EDGE wrap mode"));
+                  return false;
+              }
+              return true;
          default:
            context->recordError(Error(GL_INVALID_ENUM));
            return false;
@@ -888,7 +895,15 @@ bool ValidateTexParamParameters(gl::Context *context, GLenum target, GLenum pnam
          case GL_LINEAR_MIPMAP_NEAREST:
          case GL_NEAREST_MIPMAP_LINEAR:
          case GL_LINEAR_MIPMAP_LINEAR:
-              return (target != GL_TEXTURE_EXTERNAL_OES);
+              if (target == GL_TEXTURE_EXTERNAL_OES)
+              {
+                  // OES_EGL_image_external specifies this error.
+                  context->recordError(
+                      Error(GL_INVALID_ENUM,
+                            "external textures only support NEAREST and LINEAR filtering"));
+                  return false;
+              }
+              return true;
          default:
            context->recordError(Error(GL_INVALID_ENUM));
            return false;