diff options
| author | 2015-06-21 13:40:28 +0100 | |
|---|---|---|
| committer | 2015-06-28 00:36:54 +0100 | |
| commit | 596b7c4f63e38d275b6a056d6125c0027a1376e7 (patch) | |
| tree | fb0ab64194f7beb8ddeab145db68d27401ea9790 /src/video_core | |
| parent | Common: Cleanup memory and misc includes. (diff) | |
| download | yuzu-596b7c4f63e38d275b6a056d6125c0027a1376e7.tar.gz yuzu-596b7c4f63e38d275b6a056d6125c0027a1376e7.tar.xz yuzu-596b7c4f63e38d275b6a056d6125c0027a1376e7.zip | |
Common: Cleanup key_map includes.
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 8 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 518f79331..2edc38ac5 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -2,10 +2,14 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <cstring> | ||
| 6 | #include <memory> | ||
| 7 | |||
| 5 | #include "common/color.h" | 8 | #include "common/color.h" |
| 6 | 9 | ||
| 7 | #include "core/settings.h" | ||
| 8 | #include "core/hw/gpu.h" | 10 | #include "core/hw/gpu.h" |
| 11 | #include "core/memory.h" | ||
| 12 | #include "core/settings.h" | ||
| 9 | 13 | ||
| 10 | #include "video_core/pica.h" | 14 | #include "video_core/pica.h" |
| 11 | #include "video_core/utils.h" | 15 | #include "video_core/utils.h" |
| @@ -16,8 +20,6 @@ | |||
| 16 | 20 | ||
| 17 | #include "generated/gl_3_2_core.h" | 21 | #include "generated/gl_3_2_core.h" |
| 18 | 22 | ||
| 19 | #include <memory> | ||
| 20 | |||
| 21 | static bool IsPassThroughTevStage(const Pica::Regs::TevStageConfig& stage) { | 23 | static bool IsPassThroughTevStage(const Pica::Regs::TevStageConfig& stage) { |
| 22 | return (stage.color_op == Pica::Regs::TevStageConfig::Operation::Replace && | 24 | return (stage.color_op == Pica::Regs::TevStageConfig::Operation::Replace && |
| 23 | stage.alpha_op == Pica::Regs::TevStageConfig::Operation::Replace && | 25 | stage.alpha_op == Pica::Regs::TevStageConfig::Operation::Replace && |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index d7d422b1f..911ae8c36 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -4,6 +4,10 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <vector> | ||
| 8 | |||
| 9 | #include "common/common_types.h" | ||
| 10 | |||
| 7 | #include "video_core/hwrasterizer_base.h" | 11 | #include "video_core/hwrasterizer_base.h" |
| 8 | 12 | ||
| 9 | #include "gl_state.h" | 13 | #include "gl_state.h" |