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/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index 2552dc7..8c2eb4a 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -409,7 +409,8 @@
       default: UNREACHABLE();
     }
 
-    if (logicalTextureUnit >= 0 && logicalTextureUnit < (GLint)mRenderer->getMaxCombinedTextureImageUnits())
+    // TODO (geofflang):  Use context's caps
+    if (logicalTextureUnit >= 0 && logicalTextureUnit < (GLint)mRenderer->getRendererCaps().maxCombinedTextureImageUnits)
     {
         return logicalTextureUnit;
     }
@@ -2694,7 +2695,8 @@
     // DrawArrays and DrawElements will issue the INVALID_OPERATION error.
     updateSamplerMapping();
 
-    const unsigned int maxCombinedTextureImageUnits = mRenderer->getMaxCombinedTextureImageUnits();
+    // TODO (geofflang):  Use context's caps
+    const unsigned int maxCombinedTextureImageUnits = mRenderer->getRendererCaps().maxCombinedTextureImageUnits;
     TextureType textureUnitType[IMPLEMENTATION_MAX_COMBINED_TEXTURE_IMAGE_UNITS];
 
     for (unsigned int i = 0; i < IMPLEMENTATION_MAX_COMBINED_TEXTURE_IMAGE_UNITS; ++i)