commit bc90a4804f58d2b24babe6f247db57b9a6cdc58f
author Geoff Lang <geofflang@chromium.org> Tue Sep 17 16:51:27 2013 -0400
committer Geoff Lang <geofflang@chromium.org> Thu Nov 28 14:40:52 2013 +0000
tree 15143572674b612e415c1d2d3e2f1f236ee6295f
parent ed883f5416ad89f727674b096c247f668ae64cf7

Added TEXTURE_SWIZZLE_* parameters to the texture sampler state and API queries.

Change-Id: I20aff392ec4cd9e49424afae94a862fdd8eef9b8
Reviewed-on: https://chromium-review.googlesource.com/177030
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Commit-Queue: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>

src/libGLESv2/validationES.cpp

diff --git a/src/libGLESv2/validationES.cpp b/src/libGLESv2/validationES.cpp
index b3f8d90..fd3d4de 100644
--- a/src/libGLESv2/validationES.cpp
+++ b/src/libGLESv2/validationES.cpp
@@ -575,6 +575,20 @@
       case GL_TEXTURE_SWIZZLE_G:
       case GL_TEXTURE_SWIZZLE_B:
       case GL_TEXTURE_SWIZZLE_A:
+        switch (param)
+        {
+          case GL_RED:
+          case GL_GREEN:
+          case GL_BLUE:
+          case GL_ALPHA:
+          case GL_ZERO:
+          case GL_ONE:
+            return true;
+          default:
+            return gl::error(GL_INVALID_ENUM, false);
+        }
+        break;
+
       case GL_TEXTURE_BASE_LEVEL:
       case GL_TEXTURE_MAX_LEVEL:
         UNIMPLEMENTED();