commit 038dd539f71141231f5fb3569295ad82028c38a3
author Lingfeng Yang <lfy@google.com> Thu Mar 29 17:31:52 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Apr 04 17:32:43 2018 +0000
tree 20729ea4aec17c2f30476d3a3ad45d3ceabc5c0f
parent 858c1cccf61f628c99d53031f716072e8e571fd2

GLES1: glMultiTexCoord4(f|x)

BUG=angleproject:2306

+ common validation for multitexturing units
+ clang-format

Change-Id: I6eb456c273490e85fc7008e7e11d15e22dd20276
Reviewed-on: https://chromium-review.googlesource.com/987298
Commit-Queue: Lingfeng Yang <lfy@google.com>
Reviewed-by: Corentin Wallez <cwallez@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 3d3c593..b31ffc9 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -4347,6 +4347,11 @@
 
 bool ValidateActiveTexture(Context *context, GLenum texture)
 {
+    if (context->getClientMajorVersion() < 2)
+    {
+        return ValidateMultitextureUnit(context, texture);
+    }
+
     if (texture < GL_TEXTURE0 ||
         texture > GL_TEXTURE0 + context->getCaps().maxCombinedTextureImageUnits - 1)
     {