Commit 2a6564eb by Jamie Madill

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: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent e92a3546
...@@ -1506,11 +1506,13 @@ bool ValidateFramebufferTexture2D(const gl::Context *context, GLenum target, GLe ...@@ -1506,11 +1506,13 @@ bool ValidateFramebufferTexture2D(const gl::Context *context, GLenum target, GLe
gl::Texture *tex = context->getTexture(texture); gl::Texture *tex = context->getTexture(texture);
ASSERT(tex); ASSERT(tex);
const gl::Caps &caps = context->getCaps();
switch (textarget) switch (textarget)
{ {
case GL_TEXTURE_2D: case GL_TEXTURE_2D:
{ {
if (level > gl::log2(context->getMaximum2DTextureDimension())) if (level > gl::log2(caps.max2DTextureSize))
{ {
return gl::error(GL_INVALID_VALUE, false); return gl::error(GL_INVALID_VALUE, false);
} }
...@@ -1533,7 +1535,7 @@ bool ValidateFramebufferTexture2D(const gl::Context *context, GLenum target, GLe ...@@ -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_POSITIVE_Z:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_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); return gl::error(GL_INVALID_VALUE, false);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment