diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-21 14:02:11 +0100 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-28 00:36:54 +0100 |
| commit | 22ae87530b11226895a6a3682b9e75c5f5b9045d (patch) | |
| tree | 650c7ffea9971d8479a67521050c15b5347e333f /src/video_core | |
| parent | 1775adc34c588c8c37ef8c07dc0c3ff2358d5a31 (diff) | |
Common: Cleanup emu_window includes.
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/pica.h | 6 | ||||
| -rw-r--r-- | src/video_core/vertex_shader.h | 5 | ||||
| -rw-r--r-- | src/video_core/video_core.h | 7 |
3 files changed, 8 insertions, 10 deletions
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 |