diff options
Diffstat (limited to '')
| -rw-r--r-- | src/citra_qt/debugger/graphics_framebuffer.cpp | 3 | ||||
| -rw-r--r-- | src/common/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/common/color.h (renamed from src/video_core/color.h) | 0 | ||||
| -rw-r--r-- | src/core/hw/gpu.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/rasterizer.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 3 |
8 files changed, 8 insertions, 6 deletions
diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp index e07344591..6bbe7572c 100644 --- a/src/citra_qt/debugger/graphics_framebuffer.cpp +++ b/src/citra_qt/debugger/graphics_framebuffer.cpp | |||
| @@ -9,10 +9,11 @@ | |||
| 9 | #include <QPushButton> | 9 | #include <QPushButton> |
| 10 | #include <QSpinBox> | 10 | #include <QSpinBox> |
| 11 | 11 | ||
| 12 | #include "common/color.h" | ||
| 13 | |||
| 12 | #include "core/hw/gpu.h" | 14 | #include "core/hw/gpu.h" |
| 13 | #include "core/memory.h" | 15 | #include "core/memory.h" |
| 14 | 16 | ||
| 15 | #include "video_core/color.h" | ||
| 16 | #include "video_core/pica.h" | 17 | #include "video_core/pica.h" |
| 17 | #include "video_core/utils.h" | 18 | #include "video_core/utils.h" |
| 18 | 19 | ||
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index d1c306d3a..e78f4f144 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -24,6 +24,7 @@ set(HEADERS | |||
| 24 | bit_field.h | 24 | bit_field.h |
| 25 | break_points.h | 25 | break_points.h |
| 26 | chunk_file.h | 26 | chunk_file.h |
| 27 | color.h | ||
| 27 | common_funcs.h | 28 | common_funcs.h |
| 28 | common_paths.h | 29 | common_paths.h |
| 29 | common_types.h | 30 | common_types.h |
diff --git a/src/video_core/color.h b/src/common/color.h index 422fdc8af..422fdc8af 100644 --- a/src/video_core/color.h +++ b/src/common/color.h | |||
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index ed607646e..fe93b369e 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp | |||
| @@ -2,6 +2,7 @@ | |||
| 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 "common/color.h" | ||
| 5 | #include "common/common_types.h" | 6 | #include "common/common_types.h" |
| 6 | 7 | ||
| 7 | #include "core/arm/arm_interface.h" | 8 | #include "core/arm/arm_interface.h" |
| @@ -22,7 +23,6 @@ | |||
| 22 | #include "video_core/command_processor.h" | 23 | #include "video_core/command_processor.h" |
| 23 | #include "video_core/utils.h" | 24 | #include "video_core/utils.h" |
| 24 | #include "video_core/video_core.h" | 25 | #include "video_core/video_core.h" |
| 25 | #include "video_core/color.h" | ||
| 26 | 26 | ||
| 27 | namespace GPU { | 27 | namespace GPU { |
| 28 | 28 | ||
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index f50f73b52..5c7f4ae18 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt | |||
| @@ -29,7 +29,6 @@ set(HEADERS | |||
| 29 | renderer_opengl/pica_to_gl.h | 29 | renderer_opengl/pica_to_gl.h |
| 30 | renderer_opengl/renderer_opengl.h | 30 | renderer_opengl/renderer_opengl.h |
| 31 | clipper.h | 31 | clipper.h |
| 32 | color.h | ||
| 33 | command_processor.h | 32 | command_processor.h |
| 34 | gpu_debugger.h | 33 | gpu_debugger.h |
| 35 | hwrasterizer_base.h | 34 | hwrasterizer_base.h |
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 5392dae21..7b8ab72b6 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp | |||
| @@ -17,11 +17,11 @@ | |||
| 17 | #include <nihstro/shader_binary.h> | 17 | #include <nihstro/shader_binary.h> |
| 18 | 18 | ||
| 19 | #include "common/assert.h" | 19 | #include "common/assert.h" |
| 20 | #include "common/color.h" | ||
| 20 | #include "common/file_util.h" | 21 | #include "common/file_util.h" |
| 21 | #include "common/math_util.h" | 22 | #include "common/math_util.h" |
| 22 | #include "common/vector_math.h" | 23 | #include "common/vector_math.h" |
| 23 | 24 | ||
| 24 | #include "video_core/color.h" | ||
| 25 | #include "video_core/pica.h" | 25 | #include "video_core/pica.h" |
| 26 | #include "video_core/utils.h" | 26 | #include "video_core/utils.h" |
| 27 | #include "video_core/video_core.h" | 27 | #include "video_core/video_core.h" |
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index 6df3a74f2..93288be2c 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <algorithm> | 5 | #include <algorithm> |
| 6 | 6 | ||
| 7 | #include "common/color.h" | ||
| 7 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 8 | #include "common/math_util.h" | 9 | #include "common/math_util.h" |
| 9 | #include "common/profiler.h" | 10 | #include "common/profiler.h" |
| @@ -13,7 +14,6 @@ | |||
| 13 | 14 | ||
| 14 | #include "debug_utils/debug_utils.h" | 15 | #include "debug_utils/debug_utils.h" |
| 15 | #include "math.h" | 16 | #include "math.h" |
| 16 | #include "color.h" | ||
| 17 | #include "pica.h" | 17 | #include "pica.h" |
| 18 | #include "rasterizer.h" | 18 | #include "rasterizer.h" |
| 19 | #include "vertex_shader.h" | 19 | #include "vertex_shader.h" |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index bacdb7172..e33a712c6 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -2,10 +2,11 @@ | |||
| 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 "common/color.h" | ||
| 6 | |||
| 5 | #include "core/settings.h" | 7 | #include "core/settings.h" |
| 6 | #include "core/hw/gpu.h" | 8 | #include "core/hw/gpu.h" |
| 7 | 9 | ||
| 8 | #include "video_core/color.h" | ||
| 9 | #include "video_core/pica.h" | 10 | #include "video_core/pica.h" |
| 10 | #include "video_core/utils.h" | 11 | #include "video_core/utils.h" |
| 11 | #include "video_core/renderer_opengl/gl_rasterizer.h" | 12 | #include "video_core/renderer_opengl/gl_rasterizer.h" |