commit 6e5bf36ff50f7976463c3c32151ece044e802284
author Lingfeng Yang <lfy@google.com> Wed Aug 15 09:53:17 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Aug 16 15:43:07 2018 +0000
tree b6850c7ea6d718c22a88dd5c955ee5a7a53e5f21
parent f0e3c19a0c0284e726b03292ff5fbfb1f7850734

GLES1: Fixes for Gets() test

- Fixed wrong face parameter for glGetMaterial*.
- Enabled GL_LINE_SMOOTH capability in state only (no rendering yet)
- Enabled logical operation capability in state only (no rendering yet)
- Fixed wrong handling of GL_RGB/ALPHA_SCALE and
GL_POINT_COORD_REPLACE_OES

Test: Enable and pass Gets() GLES1 conformance test

BUG=angleproject:2306

Change-Id: Ib5c50a2055129b76ad24053baf0dac24dcc00761
Reviewed-on: https://chromium-review.googlesource.com/1176161
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Lingfeng Yang <lfy@google.com>

src/libANGLE/queryutils.cpp

diff --git a/src/libANGLE/queryutils.cpp b/src/libANGLE/queryutils.cpp
index 45b3cd4..c16fefa 100644
--- a/src/libANGLE/queryutils.cpp
+++ b/src/libANGLE/queryutils.cpp
@@ -838,8 +838,7 @@
         case TextureEnvParameter::Op0Alpha:
         case TextureEnvParameter::Op1Alpha:
         case TextureEnvParameter::Op2Alpha:
-        case TextureEnvParameter::RgbScale:
-        case TextureEnvParameter::AlphaScale:
+        case TextureEnvParameter::PointCoordReplace:
             return true;
         default:
             return false;
@@ -2175,6 +2174,7 @@
         case TextureEnvParameter::Op2Alpha:
         case TextureEnvParameter::RgbScale:
         case TextureEnvParameter::AlphaScale:
+        case TextureEnvParameter::PointCoordReplace:
             return 1;
         case TextureEnvParameter::Color:
             return 4;
@@ -2229,7 +2229,6 @@
                 output[i] = FixedToFloat(input[i]);
             }
             break;
-            break;
         default:
             UNREACHABLE();
             break;