commit 65ac5b9ccf8144f45f81aa0a2487dc2ee3952f1b
author Geoff Lang <geofflang@chromium.org> Mon May 01 13:16:30 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Wed May 10 19:25:34 2017 +0000
tree 400f8dff0ea87ca0282711c56625ad49e8ef4bff
parent a7ecec387cc5c68d688be7b5e5a0e05645e4f78c

Allow glGenerateMipmaps on sRGB textures in WebGL.

The generated mipmaps are still not correct on all ANGLE backends.

TEST=conformance/extensions/ext-sRGB

BUG=angleproject:2009

Change-Id: I6299dcb93c71f48e61ec660347b4747366ecfb71
Reviewed-on: https://chromium-review.googlesource.com/491367
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index b4fdb1e..1d73ae1 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -5554,10 +5554,13 @@
         return false;
     }
 
-    // GL_EXT_sRGB does not support mipmap generation on sRGB textures
-    if (context->getClientMajorVersion() == 2 && format.info->colorEncoding == GL_SRGB)
+    // ES3 and WebGL grant mipmap generation for sRGB textures but GL_EXT_sRGB does not.
+    bool supportsSRGBMipmapGeneration =
+        context->getClientVersion() >= ES_3_0 || context->getExtensions().webglCompatibility;
+    if (!supportsSRGBMipmapGeneration && format.info->colorEncoding == GL_SRGB)
     {
-        context->handleError(Error(GL_INVALID_OPERATION));
+        context->handleError(
+            Error(GL_INVALID_OPERATION, "Mipmap generation of sRGB textures is not allowed."));
         return false;
     }