From 71e1d6e25d997501b8390f2fc68aef734d35608b Mon Sep 17 00:00:00 2001 From: fearlessTobi Date: Thu, 26 Jul 2018 13:23:25 +0200 Subject: [PATCH] Fix compile errors --- src/audio_core/codec.cpp | 1 + src/audio_core/hle/filter.cpp | 1 + src/audio_core/hle/mixers.cpp | 2 +- src/audio_core/interpolate.cpp | 1 + src/audio_core/time_stretch.cpp | 1 + src/citra_qt/camera/camera_util.cpp | 1 + src/core/perf_stats.cpp | 1 + src/input_common/motion_emu.cpp | 3 ++- .../renderer_opengl/gl_rasterizer.cpp | 17 +++++++++-------- src/video_core/swrasterizer/framebuffer.cpp | 1 - src/video_core/swrasterizer/lighting.cpp | 1 + src/video_core/swrasterizer/texturing.cpp | 1 - src/video_core/texture/etc1.cpp | 1 + 13 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp index 36e70bdab..9677a9fbe 100644 --- a/src/audio_core/codec.cpp +++ b/src/audio_core/codec.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include diff --git a/src/audio_core/hle/filter.cpp b/src/audio_core/hle/filter.cpp index 0413c3b8c..0547b46be 100644 --- a/src/audio_core/hle/filter.cpp +++ b/src/audio_core/hle/filter.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include "audio_core/hle/common.h" diff --git a/src/audio_core/hle/mixers.cpp b/src/audio_core/hle/mixers.cpp index 0bd1759d3..297969a16 100644 --- a/src/audio_core/hle/mixers.cpp +++ b/src/audio_core/hle/mixers.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include - #include "audio_core/hle/mixers.h" #include "common/assert.h" #include "common/logging/log.h" diff --git a/src/audio_core/interpolate.cpp b/src/audio_core/interpolate.cpp index bf3696c59..83fb6f013 100644 --- a/src/audio_core/interpolate.cpp +++ b/src/audio_core/interpolate.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include "audio_core/interpolate.h" #include "common/assert.h" diff --git a/src/audio_core/time_stretch.cpp b/src/audio_core/time_stretch.cpp index be6ce8273..6a9a7704e 100644 --- a/src/audio_core/time_stretch.cpp +++ b/src/audio_core/time_stretch.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include diff --git a/src/citra_qt/camera/camera_util.cpp b/src/citra_qt/camera/camera_util.cpp index 3d67b1e7a..a2f01e651 100644 --- a/src/citra_qt/camera/camera_util.cpp +++ b/src/citra_qt/camera/camera_util.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include "citra_qt/camera/camera_util.h" diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp index 0dead3e03..28f39082d 100644 --- a/src/core/perf_stats.cpp +++ b/src/core/perf_stats.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include diff --git a/src/input_common/motion_emu.cpp b/src/input_common/motion_emu.cpp index 2a60e37fc..459691000 100644 --- a/src/input_common/motion_emu.cpp +++ b/src/input_common/motion_emu.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include @@ -45,7 +46,7 @@ public: } else { tilt_direction = mouse_move.Cast(); tilt_angle = std::clamp(tilt_direction.Normalize() * sensitivity, 0.0f, - MathUtil::PI * this->tilt_clamp / 180.0f); + MathUtil::PI * this->tilt_clamp / 180.0f); } } } diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index eae759b5a..4bc73310e 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include @@ -534,17 +535,17 @@ bool RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) { MathUtil::Rectangle draw_rect{ static_cast(std::clamp(static_cast(surfaces_rect.left) + - viewport_rect_unscaled.left * res_scale, - surfaces_rect.left, surfaces_rect.right)), // Left + viewport_rect_unscaled.left * res_scale, + surfaces_rect.left, surfaces_rect.right)), // Left static_cast(std::clamp(static_cast(surfaces_rect.bottom) + - viewport_rect_unscaled.top * res_scale, - surfaces_rect.bottom, surfaces_rect.top)), // Top + viewport_rect_unscaled.top * res_scale, + surfaces_rect.bottom, surfaces_rect.top)), // Top static_cast(std::clamp(static_cast(surfaces_rect.left) + - viewport_rect_unscaled.right * res_scale, - surfaces_rect.left, surfaces_rect.right)), // Right + viewport_rect_unscaled.right * res_scale, + surfaces_rect.left, surfaces_rect.right)), // Right static_cast(std::clamp(static_cast(surfaces_rect.bottom) + - viewport_rect_unscaled.bottom * res_scale, - surfaces_rect.bottom, surfaces_rect.top))}; // Bottom + viewport_rect_unscaled.bottom * res_scale, + surfaces_rect.bottom, surfaces_rect.top))}; // Bottom // Bind the framebuffer surfaces state.draw.draw_framebuffer = framebuffer.handle; diff --git a/src/video_core/swrasterizer/framebuffer.cpp b/src/video_core/swrasterizer/framebuffer.cpp index 0b92dfde1..509d2ce45 100644 --- a/src/video_core/swrasterizer/framebuffer.cpp +++ b/src/video_core/swrasterizer/framebuffer.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include - #include "common/assert.h" #include "common/color.h" #include "common/common_types.h" diff --git a/src/video_core/swrasterizer/lighting.cpp b/src/video_core/swrasterizer/lighting.cpp index e4d4f7aeb..4e08d9690 100644 --- a/src/video_core/swrasterizer/lighting.cpp +++ b/src/video_core/swrasterizer/lighting.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include "video_core/swrasterizer/lighting.h" namespace Pica { diff --git a/src/video_core/swrasterizer/texturing.cpp b/src/video_core/swrasterizer/texturing.cpp index 83d434c94..03612a7b0 100644 --- a/src/video_core/swrasterizer/texturing.cpp +++ b/src/video_core/swrasterizer/texturing.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include - #include "common/assert.h" #include "common/common_types.h" #include "common/vector_math.h" diff --git a/src/video_core/texture/etc1.cpp b/src/video_core/texture/etc1.cpp index 343105f40..10bb06501 100644 --- a/src/video_core/texture/etc1.cpp +++ b/src/video_core/texture/etc1.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include "common/bit_field.h" #include "common/color.h"