diff options
author | archshift <gh@archshift.com> | 2015-05-24 21:20:31 +0200 |
---|---|---|
committer | archshift <gh@archshift.com> | 2015-05-30 20:17:37 +0200 |
commit | 76690392bf8923d7172936836d15e3caebb26cf0 (patch) | |
tree | e5896ecb4f042e88a650f4ad2287393e2346c094 /src | |
parent | Move video_core/math.h to common/vector_math.h (diff) | |
download | yuzu-76690392bf8923d7172936836d15e3caebb26cf0.tar yuzu-76690392bf8923d7172936836d15e3caebb26cf0.tar.gz yuzu-76690392bf8923d7172936836d15e3caebb26cf0.tar.bz2 yuzu-76690392bf8923d7172936836d15e3caebb26cf0.tar.lz yuzu-76690392bf8923d7172936836d15e3caebb26cf0.tar.xz yuzu-76690392bf8923d7172936836d15e3caebb26cf0.tar.zst yuzu-76690392bf8923d7172936836d15e3caebb26cf0.zip |
Diffstat (limited to 'src')
-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 @@ #include <QPushButton> #include <QSpinBox> +#include "common/color.h" + #include "core/hw/gpu.h" #include "core/memory.h" -#include "video_core/color.h" #include "video_core/pica.h" #include "video_core/utils.h" 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 bit_field.h break_points.h chunk_file.h + color.h common_funcs.h common_paths.h 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 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "common/color.h" #include "common/common_types.h" #include "core/arm/arm_interface.h" @@ -22,7 +23,6 @@ #include "video_core/command_processor.h" #include "video_core/utils.h" #include "video_core/video_core.h" -#include "video_core/color.h" namespace GPU { 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 renderer_opengl/pica_to_gl.h renderer_opengl/renderer_opengl.h clipper.h - color.h command_processor.h gpu_debugger.h 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 @@ #include <nihstro/shader_binary.h> #include "common/assert.h" +#include "common/color.h" #include "common/file_util.h" #include "common/math_util.h" #include "common/vector_math.h" -#include "video_core/color.h" #include "video_core/pica.h" #include "video_core/utils.h" #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 @@ #include <algorithm> +#include "common/color.h" #include "common/common_types.h" #include "common/math_util.h" #include "common/profiler.h" @@ -13,7 +14,6 @@ #include "debug_utils/debug_utils.h" #include "math.h" -#include "color.h" #include "pica.h" #include "rasterizer.h" #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 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "common/color.h" + #include "core/settings.h" #include "core/hw/gpu.h" -#include "video_core/color.h" #include "video_core/pica.h" #include "video_core/utils.h" #include "video_core/renderer_opengl/gl_rasterizer.h" |