summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-06-21 15:02:11 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-06-28 01:36:54 +0200
commit22ae87530b11226895a6a3682b9e75c5f5b9045d (patch)
tree650c7ffea9971d8479a67521050c15b5347e333f /src
parentCommon: Remove unused ROUND_UP_POW2 macro. (diff)
downloadyuzu-22ae87530b11226895a6a3682b9e75c5f5b9045d.tar
yuzu-22ae87530b11226895a6a3682b9e75c5f5b9045d.tar.gz
yuzu-22ae87530b11226895a6a3682b9e75c5f5b9045d.tar.bz2
yuzu-22ae87530b11226895a6a3682b9e75c5f5b9045d.tar.lz
yuzu-22ae87530b11226895a6a3682b9e75c5f5b9045d.tar.xz
yuzu-22ae87530b11226895a6a3682b9e75c5f5b9045d.tar.zst
yuzu-22ae87530b11226895a6a3682b9e75c5f5b9045d.zip
Diffstat (limited to 'src')
-rw-r--r--src/common/emu_window.cpp6
-rw-r--r--src/common/emu_window.h12
-rw-r--r--src/video_core/pica.h6
-rw-r--r--src/video_core/vertex_shader.h5
-rw-r--r--src/video_core/video_core.h7
5 files changed, 23 insertions, 13 deletions
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index 43facb85c..b69b05cb9 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -2,6 +2,12 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <algorithm>
+#include <cmath>
+
+#include "common/assert.h"
+#include "common/key_map.h"
+
#include "emu_window.h"
#include "video_core/video_core.h"
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index 8eca6b5d5..a0ae4c9fa 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -4,11 +4,17 @@
#pragma once
+#include <tuple>
+#include <utility>
+
#include "common/common_types.h"
-#include "common/key_map.h"
#include "common/math_util.h"
-#include "common/scm_rev.h"
-#include "common/string_util.h"
+
+#include "core/hle/service/hid/hid.h"
+
+namespace KeyMap {
+struct HostDeviceKey;
+}
/**
* Abstraction class used to provide an interface between emulation code and the frontend
diff --git a/src/video_core/pica.h b/src/video_core/pica.h
index 9628a7589..be8ff7590 100644
--- a/src/video_core/pica.h
+++ b/src/video_core/pica.h
@@ -5,10 +5,10 @@
#pragma once
#include <array>
+#include <cmath>
#include <cstddef>
-#include <initializer_list>
#include <map>
-#include <vector>
+#include <string>
#include "common/assert.h"
#include "common/bit_field.h"
@@ -1014,7 +1014,7 @@ struct float24 {
u32 mantissa = hex & 0xFFFF;
u32 exponent = (hex >> 16) & 0x7F;
u32 sign = hex >> 23;
- ret.value = powf(2.0f, (float)exponent-63.0f) * (1.0f + mantissa * powf(2.0f, -16.f));
+ ret.value = std::pow(2.0f, (float)exponent-63.0f) * (1.0f + mantissa * std::pow(2.0f, -16.f));
if (sign)
ret.value = -ret.value;
}
diff --git a/src/video_core/vertex_shader.h b/src/video_core/vertex_shader.h
index 7471a6de8..c997e6a77 100644
--- a/src/video_core/vertex_shader.h
+++ b/src/video_core/vertex_shader.h
@@ -4,11 +4,10 @@
#pragma once
-#include <initializer_list>
+#include <type_traits>
-#include <common/common_types.h>
+#include "common/vector_math.h"
-#include "math.h"
#include "pica.h"
namespace Pica {
diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h
index 3f24df7bd..14b33c9dd 100644
--- a/src/video_core/video_core.h
+++ b/src/video_core/video_core.h
@@ -4,12 +4,11 @@
#pragma once
-#include "common/emu_window.h"
-
-#include "renderer_base.h"
-
#include <atomic>
+class EmuWindow;
+class RendererBase;
+
////////////////////////////////////////////////////////////////////////////////////////////////////
// Video Core namespace