commit e547aac75202667b8d6780eb5bc5de166d4352be
author Lingfeng Yang <lfy@google.com> Thu Apr 05 09:39:20 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Sat Apr 07 05:28:16 2018 +0000
tree 4c621a9389df9b0f9ba7d1e30ec53287f326ad8f
parent 8957e832818bfd2d941d88cd7583bd8558a639ad

GLES1: gl(Push|Pop)Matrix

BUG=angleproject:2306

Change-Id: I96498aebbbc62ebd53e5320db17ef6a54d20d2dc
Reviewed-on: https://chromium-review.googlesource.com/998308
Commit-Queue: Lingfeng Yang <lfy@google.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 5fbc18b..f7ce94e 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -1647,6 +1647,15 @@
         case GL_MAX_TEXTURE_UNITS:
             *params = mCaps.maxMultitextureUnits;
             break;
+        case GL_MAX_MODELVIEW_STACK_DEPTH:
+            *params = mCaps.maxModelviewMatrixStackDepth;
+            break;
+        case GL_MAX_PROJECTION_STACK_DEPTH:
+            *params = mCaps.maxProjectionMatrixStackDepth;
+            break;
+        case GL_MAX_TEXTURE_STACK_DEPTH:
+            *params = mCaps.maxTextureMatrixStackDepth;
+            break;
         default:
             handleError(mGLState.getIntegerv(this, pname, params));
             break;
@@ -2860,9 +2869,9 @@
         mCaps.maxMultitextureUnits          = 4;
         mCaps.maxClipPlanes                 = 6;
         mCaps.maxLights                     = 8;
-        mCaps.maxModelviewMatrixStackDepth  = 16;
-        mCaps.maxProjectionMatrixStackDepth = 16;
-        mCaps.maxTextureMatrixStackDepth    = 16;
+        mCaps.maxModelviewMatrixStackDepth  = Caps::GlobalMatrixStackDepth;
+        mCaps.maxProjectionMatrixStackDepth = Caps::GlobalMatrixStackDepth;
+        mCaps.maxTextureMatrixStackDepth    = Caps::GlobalMatrixStackDepth;
     }
 
     mExtensions = mImplementation->getNativeExtensions();
@@ -6845,6 +6854,12 @@
         switch (pname)
         {
             case GL_ALPHA_TEST_FUNC:
+            case GL_CLIENT_ACTIVE_TEXTURE:
+            case GL_MATRIX_MODE:
+            case GL_MAX_TEXTURE_UNITS:
+            case GL_MAX_MODELVIEW_STACK_DEPTH:
+            case GL_MAX_PROJECTION_STACK_DEPTH:
+            case GL_MAX_TEXTURE_STACK_DEPTH:
                 *type      = GL_INT;
                 *numParams = 1;
                 return true;
@@ -6852,15 +6867,8 @@
                 *type      = GL_FLOAT;
                 *numParams = 1;
                 return true;
-            case GL_MAX_TEXTURE_UNITS:
-                *type      = GL_INT;
-                *numParams = 1;
-                return true;
-            case GL_CLIENT_ACTIVE_TEXTURE:
-                *type      = GL_INT;
-                *numParams = 1;
-                return true;
             case GL_CURRENT_COLOR:
+            case GL_CURRENT_TEXTURE_COORDS:
                 *type      = GL_FLOAT;
                 *numParams = 4;
                 return true;
@@ -6868,14 +6876,6 @@
                 *type      = GL_FLOAT;
                 *numParams = 3;
                 return true;
-            case GL_CURRENT_TEXTURE_COORDS:
-                *type      = GL_FLOAT;
-                *numParams = 4;
-                return true;
-            case GL_MATRIX_MODE:
-                *type      = GL_INT;
-                *numParams = 1;
-                return true;
         }
     }