commit fb2a559726e4bb61814d081070d391fc9203c56e
author Geoff Lang <geofflang@chromium.org> Fri Mar 20 11:25:37 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Fri Mar 20 15:38:42 2015 +0000
tree bba304079b8ec144706d6ec2a776edb0d9982538
parent 30ceb3a12d122f1a7680e52c4a5888a82c4ac349

Fix incorrect assertion.

BUG=angleproject:884

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

src/libANGLE/renderer/gl/TextureGL.cpp

diff --git a/src/libANGLE/renderer/gl/TextureGL.cpp b/src/libANGLE/renderer/gl/TextureGL.cpp
index f209d5c..ca7a3c1 100644
--- a/src/libANGLE/renderer/gl/TextureGL.cpp
+++ b/src/libANGLE/renderer/gl/TextureGL.cpp
@@ -52,7 +52,7 @@
     }
     else
     {
-        return gl::IsCubeMapTextureTarget(textureType);
+        return gl::IsCubeMapTextureTarget(textureTarget);
     }
 }
 
@@ -88,7 +88,7 @@
 gl::Error TextureGL::setImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size, GLenum format, GLenum type,
                               const gl::PixelUnpackState &unpack, const uint8_t *pixels)
 {
-    (void)&CompatibleTextureTarget; // Reference this function to avoid warnings.
+    UNUSED_ASSERTION_VARIABLE(&CompatibleTextureTarget); // Reference this function to avoid warnings.
     ASSERT(CompatibleTextureTarget(mTextureType, target));
 
     SetUnpackStateForTexImage(mStateManager, unpack);