Commit 7ee40d1a by Corentin Wallez

Fix compilation failures on OSX standalone builds

BUG= Change-Id: Ifd40ae30d601227caf550546fcffc286cf533a73 Reviewed-on: https://chromium-review.googlesource.com/320290 Tryjob-Request: Corentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent ce8045dc
...@@ -3,13 +3,17 @@ ...@@ -3,13 +3,17 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// ANGLEPerfTests:
// Base class for google test performance tests
//
#include "ANGLEPerfTest.h" #include "ANGLEPerfTest.h"
#include "third_party/perf/perf_test.h" #include "third_party/perf/perf_test.h"
#include <iostream>
#include <cassert> #include <cassert>
#include <cmath>
#include <iostream>
ANGLEPerfTest::ANGLEPerfTest(const std::string &name, const std::string &suffix) ANGLEPerfTest::ANGLEPerfTest(const std::string &name, const std::string &suffix)
: mName(name), : mName(name),
......
...@@ -10,19 +10,20 @@ ...@@ -10,19 +10,20 @@
#ifndef PERF_TESTS_ANGLE_PERF_TEST_H_ #ifndef PERF_TESTS_ANGLE_PERF_TEST_H_
#define PERF_TESTS_ANGLE_PERF_TEST_H_ #define PERF_TESTS_ANGLE_PERF_TEST_H_
#include <gtest/gtest.h>
#include <string> #include <string>
#include <vector> #include <vector>
#include <gtest/gtest.h>
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include "EGLWindow.h"
#include "OSWindow.h"
#include "Timer.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/debug.h" #include "common/debug.h"
#include "EGLWindow.h"
#include "OSWindow.h"
#include "test_utils/angle_test_configs.h" #include "test_utils/angle_test_configs.h"
#include "test_utils/angle_test_instantiate.h" #include "test_utils/angle_test_instantiate.h"
#include "Timer.h"
class Event; class Event;
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
// Performance tests for ANGLE instanced draw calls. // Performance tests for ANGLE instanced draw calls.
// //
#include <cmath>
#include <sstream> #include <sstream>
#include "ANGLEPerfTest.h" #include "ANGLEPerfTest.h"
...@@ -24,7 +25,7 @@ namespace ...@@ -24,7 +25,7 @@ namespace
float AnimationSignal(float t) float AnimationSignal(float t)
{ {
float l = t / 2.0f; float l = t / 2.0f;
float f = l - floor(l); float f = l - std::floor(l);
return (f > 0.5f ? 1.0f - f : f) * 4.0f - 1.0f; return (f > 0.5f ? 1.0f - f : f) * 4.0f - 1.0f;
} }
......
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