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/207540Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Fix build errors in validationES.cpp.
2a6564eb · Jamie Madill · e92a3546 · 2a6564eb
Commit 2a6564eb authored Jul 11, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

validationES.cpp src/libGLESv2/validationES.cpp +4 -2

No files found.
--- a/src/libGLESv2/validationES.cpp
+++ b/src/libGLESv2/validationES.cpp
@@ -1506,11 +1506,13 @@ bool ValidateFramebufferTexture2D(const gl::Context *context, GLenum target, GLe
        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 @@ bool ValidateFramebufferTexture2D(const gl::Context *context, GLenum target, GLe
          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);
                }