commit 3a61c321e7ea779f23a4da72db977286897b1168
author Geoff Lang <geofflang@chromium.org> Thu Jul 10 13:01:54 2014 -0400
committer Geoff Lang <geofflang@chromium.org> Thu Aug 28 20:16:43 2014 +0000
tree f00b7fe0afe483b608083bdfa008bca21f7bf6fb
parent a59b8ba4b53ca9e79fd7f3bafd8e7ec0ae385844

Add caps for the aggregate shader limits from table 6.33.

BUG=angle:658

Change-Id: I59d0cd131114fcb925f01d83d218a657f4498a2a
Reviewed-on: https://chromium-review.googlesource.com/207375
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/State.cpp

diff --git a/src/libGLESv2/State.cpp b/src/libGLESv2/State.cpp
index 0208898..9ddfc43 100644
--- a/src/libGLESv2/State.cpp
+++ b/src/libGLESv2/State.cpp
@@ -1314,19 +1314,19 @@
         }
         break;
       case GL_TEXTURE_BINDING_2D:
-        ASSERT(mActiveSampler < mContext->getMaximumCombinedTextureImageUnits());
+        ASSERT(mActiveSampler < mContext->getCaps().maxCombinedTextureImageUnits);
         *params = mSamplerTexture[TEXTURE_2D][mActiveSampler].id();
         break;
       case GL_TEXTURE_BINDING_CUBE_MAP:
-        ASSERT(mActiveSampler < mContext->getMaximumCombinedTextureImageUnits());
+        ASSERT(mActiveSampler < mContext->getCaps().maxCombinedTextureImageUnits);
         *params = mSamplerTexture[TEXTURE_CUBE][mActiveSampler].id();
         break;
       case GL_TEXTURE_BINDING_3D:
-        ASSERT(mActiveSampler < mContext->getMaximumCombinedTextureImageUnits());
+        ASSERT(mActiveSampler <mContext->getCaps().maxCombinedTextureImageUnits);
         *params = mSamplerTexture[TEXTURE_3D][mActiveSampler].id();
         break;
       case GL_TEXTURE_BINDING_2D_ARRAY:
-        ASSERT(mActiveSampler < mContext->getMaximumCombinedTextureImageUnits());
+        ASSERT(mActiveSampler < mContext->getCaps().maxCombinedTextureImageUnits);
         *params = mSamplerTexture[TEXTURE_2D_ARRAY][mActiveSampler].id();
         break;
       case GL_UNIFORM_BUFFER_BINDING: