Commit 14718767 by Jamie Madill Committed by Commit Bot

Remove usage of std::log2 in tests.

For some reason, this was giving a link error on Android. Change it to use the mathutil version to be sure. BUG=angleproject:1493 BUG=chromium:638323 Change-Id: I454ba4609d7818f50c668bb7c1a3b684f9ca8444 Reviewed-on: https://chromium-review.googlesource.com/381671Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 509e4560
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#include <cmath> #include "common/mathutil.h"
#include "test_utils/ANGLETest.h" #include "test_utils/ANGLETest.h"
#include "test_utils/gl_raii.h" #include "test_utils/gl_raii.h"
...@@ -3494,7 +3493,7 @@ TEST_P(Texture2DTestES3, DepthTexturesWithMipmaps) ...@@ -3494,7 +3493,7 @@ TEST_P(Texture2DTestES3, DepthTexturesWithMipmaps)
const int size = getWindowWidth(); const int size = getWindowWidth();
auto dim = [size](int level) { return size >> level; }; auto dim = [size](int level) { return size >> level; };
int levels = static_cast<int>(std::log2(size)); int levels = gl::log2(size);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D); glBindTexture(GL_TEXTURE_2D, mTexture2D);
......
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