diff options
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-27 18:56:17 +0200 |
---|---|---|
committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-28 01:46:39 +0200 |
commit | 4964a359e1a82f87a9772140fd1d933c5812c2e7 (patch) | |
tree | 49bae12a6ba7f7d946bb85fe9d304ab958815609 | |
parent | Core: Cleanup soc:U includes. (diff) | |
download | yuzu-4964a359e1a82f87a9772140fd1d933c5812c2e7.tar yuzu-4964a359e1a82f87a9772140fd1d933c5812c2e7.tar.gz yuzu-4964a359e1a82f87a9772140fd1d933c5812c2e7.tar.bz2 yuzu-4964a359e1a82f87a9772140fd1d933c5812c2e7.tar.lz yuzu-4964a359e1a82f87a9772140fd1d933c5812c2e7.tar.xz yuzu-4964a359e1a82f87a9772140fd1d933c5812c2e7.tar.zst yuzu-4964a359e1a82f87a9772140fd1d933c5812c2e7.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/dsp_dsp.h | 2 | ||||
-rw-r--r-- | src/core/hle/service/gsp_gpu.h | 3 | ||||
-rw-r--r-- | src/core/hle/service/y2r_u.h | 2 | ||||
-rw-r--r-- | src/core/hw/gpu.cpp | 10 | ||||
-rw-r--r-- | src/core/hw/gpu.h | 1 | ||||
-rw-r--r-- | src/core/hw/lcd.cpp | 2 | ||||
-rw-r--r-- | src/core/hw/lcd.h | 1 | ||||
-rw-r--r-- | src/core/hw/y2r.cpp | 4 | ||||
-rw-r--r-- | src/video_core/command_processor.h | 4 | ||||
-rw-r--r-- | src/video_core/hwrasterizer_base.h | 9 | ||||
-rw-r--r-- | src/video_core/renderer_base.h | 2 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 1 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 1 |
13 files changed, 31 insertions, 11 deletions
diff --git a/src/core/hle/service/dsp_dsp.h b/src/core/hle/service/dsp_dsp.h index fa13bfb7c..54109b2a9 100644 --- a/src/core/hle/service/dsp_dsp.h +++ b/src/core/hle/service/dsp_dsp.h @@ -4,6 +4,8 @@ #pragma once +#include <string> + #include "core/hle/service/service.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/hle/service/gsp_gpu.h b/src/core/hle/service/gsp_gpu.h index a435d418a..d9e9a1a60 100644 --- a/src/core/hle/service/gsp_gpu.h +++ b/src/core/hle/service/gsp_gpu.h @@ -5,8 +5,11 @@ #pragma once #include <cstddef> +#include <string> #include "common/bit_field.h" +#include "common/common_types.h" + #include "core/hle/service/service.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/hle/service/y2r_u.h b/src/core/hle/service/y2r_u.h index 7df47fcb9..9454e5aab 100644 --- a/src/core/hle/service/y2r_u.h +++ b/src/core/hle/service/y2r_u.h @@ -5,9 +5,11 @@ #pragma once #include <array> +#include <string> #include "common/common_types.h" +#include "core/hle/result.h" #include "core/hle/service/service.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index bdceb6984..901519a8b 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -2,17 +2,18 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <cstring> +#include <type_traits> + #include "common/color.h" #include "common/common_types.h" - -#include "core/arm/arm_interface.h" +#include "common/logging/log.h" +#include "common/vector_math.h" #include "core/settings.h" -#include "core/core.h" #include "core/memory.h" #include "core/core_timing.h" -#include "core/hle/hle.h" #include "core/hle/service/gsp_gpu.h" #include "core/hle/service/dsp_dsp.h" #include "core/hle/service/hid/hid.h" @@ -21,6 +22,7 @@ #include "core/hw/gpu.h" #include "video_core/command_processor.h" +#include "video_core/hwrasterizer_base.h" #include "video_core/renderer_base.h" #include "video_core/utils.h" #include "video_core/video_core.h" diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index 699bcd2a5..5b8c43f8b 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h @@ -5,6 +5,7 @@ #pragma once #include <cstddef> +#include <type_traits> #include "common/assert.h" #include "common/bit_field.h" diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp index 963c8d981..cdb757a18 100644 --- a/src/core/hw/lcd.cpp +++ b/src/core/hw/lcd.cpp @@ -7,8 +7,6 @@ #include "common/common_types.h" #include "common/logging/log.h" -#include "core/arm/arm_interface.h" -#include "core/hle/hle.h" #include "core/hw/hw.h" #include "core/hw/lcd.h" diff --git a/src/core/hw/lcd.h b/src/core/hw/lcd.h index 8631eb201..bcce6d8cf 100644 --- a/src/core/hw/lcd.h +++ b/src/core/hw/lcd.h @@ -5,6 +5,7 @@ #pragma once #include <cstddef> +#include <type_traits> #include "common/bit_field.h" #include "common/common_funcs.h" diff --git a/src/core/hw/y2r.cpp b/src/core/hw/y2r.cpp index 5b7fb39e1..b40f13cae 100644 --- a/src/core/hw/y2r.cpp +++ b/src/core/hw/y2r.cpp @@ -2,8 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <algorithm> #include <array> -#include <numeric> +#include <cstddef> +#include <memory> #include "common/assert.h" #include "common/color.h" diff --git a/src/video_core/command_processor.h b/src/video_core/command_processor.h index bb3d4150f..022a71f5e 100644 --- a/src/video_core/command_processor.h +++ b/src/video_core/command_processor.h @@ -4,11 +4,11 @@ #pragma once +#include <type_traits> + #include "common/bit_field.h" #include "common/common_types.h" -#include "pica.h" - namespace Pica { namespace CommandProcessor { diff --git a/src/video_core/hwrasterizer_base.h b/src/video_core/hwrasterizer_base.h index dec193f8b..c8746c608 100644 --- a/src/video_core/hwrasterizer_base.h +++ b/src/video_core/hwrasterizer_base.h @@ -4,8 +4,13 @@ #pragma once -#include "common/emu_window.h" -#include "video_core/vertex_shader.h" +#include "common/common_types.h" + +namespace Pica { +namespace VertexShader { +struct OutputVertex; +} +} class HWRasterizer { public: diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h index fbbf17db4..6587bcf27 100644 --- a/src/video_core/renderer_base.h +++ b/src/video_core/renderer_base.h @@ -10,6 +10,8 @@ #include "video_core/hwrasterizer_base.h" +class EmuWindow; + class RendererBase : NonCopyable { public: diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 2edc38ac5..935a9f281 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -6,6 +6,7 @@ #include <memory> #include "common/color.h" +#include "common/math_util.h" #include "core/hw/gpu.h" #include "core/memory.h" diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 911ae8c36..ae7b26fc6 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -9,6 +9,7 @@ #include "common/common_types.h" #include "video_core/hwrasterizer_base.h" +#include "video_core/vertex_shader.h" #include "gl_state.h" #include "gl_rasterizer_cache.h" |