commit 2a6564eb7314c6da27d8d21c5a068034d251d028
author Jamie Madill <jmadill@chromium.org> Fri Jul 11 09:53:19 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Fri Jul 11 13:55:06 2014 +0000
tree 81fb443599d8582197ee380d7a4709635f7faa42
parent e92a3546da271f33110714508529fef7306c4656

Fix build errors in validationES.cpp.

This was caused by a bad auto-merge with the Caps patch.

BUG=angle:694

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

src/libGLESv2/validationES.cpp

diff --git a/src/libGLESv2/validationES.cpp b/src/libGLESv2/validationES.cpp
index bf0cfca..cc6f91c 100644
--- a/src/libGLESv2/validationES.cpp
+++ b/src/libGLESv2/validationES.cpp
@@ -1506,11 +1506,13 @@
         gl::Texture *tex = context->getTexture(texture);
         ASSERT(tex);
 
+        const gl::Caps &caps = context->getCaps();
+
         switch (textarget)
         {
           case GL_TEXTURE_2D:
             {
-                if (level > gl::log2(context->getMaximum2DTextureDimension()))
+                if (level > gl::log2(caps.max2DTextureSize))
                 {
                     return gl::error(GL_INVALID_VALUE, false);
                 }
@@ -1533,7 +1535,7 @@
           case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
           case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
             {
-                if (level > gl::log2(context->getMaximumCubeTextureDimension()))
+                if (level > gl::log2(caps.maxCubeMapTextureSize))
                 {
                     return gl::error(GL_INVALID_VALUE, false);
                 }