From 5df2d1b5f75e0ee2d3fce7131fcee5dc8e1d7cc4 Mon Sep 17 00:00:00 2001 From: archshift Date: Sun, 24 May 2015 12:16:22 -0700 Subject: [PATCH 1/2] Move video_core/math.h to common/vector_math.h The file only contained vector manipulation code, and such widely-useable code doesn't belong in video_core. --- src/citra_qt/debugger/graphics_cmdlists.cpp | 4 ++-- src/common/CMakeLists.txt | 1 + src/{video_core/math.h => common/vector_math.h} | 0 src/video_core/CMakeLists.txt | 1 - src/video_core/color.h | 3 +-- src/video_core/debug_utils/debug_utils.cpp | 2 +- src/video_core/debug_utils/debug_utils.h | 3 ++- src/video_core/pica.h | 3 +-- src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) rename src/{video_core/math.h => common/vector_math.h} (100%) diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp index 804c735a3..cabf5fe07 100644 --- a/src/citra_qt/debugger/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics_cmdlists.cpp @@ -11,10 +11,10 @@ #include #include -#include "video_core/pica.h" -#include "video_core/math.h" +#include "common/vector_math.h" #include "video_core/debug_utils/debug_utils.h" +#include "video_core/pica.h" #include "graphics_cmdlists.h" diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index dbaaac77b..d1c306d3a 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -54,6 +54,7 @@ set(HEADERS thread_queue_list.h thunk.h timer.h + vector_math.h ) create_directory_groups(${SRCS} ${HEADERS}) diff --git a/src/video_core/math.h b/src/common/vector_math.h similarity index 100% rename from src/video_core/math.h rename to src/common/vector_math.h diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 0258a3255..f50f73b52 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -33,7 +33,6 @@ set(HEADERS command_processor.h gpu_debugger.h hwrasterizer_base.h - math.h pica.h primitive_assembly.h rasterizer.h diff --git a/src/video_core/color.h b/src/video_core/color.h index 4d2026eb0..422fdc8af 100644 --- a/src/video_core/color.h +++ b/src/video_core/color.h @@ -6,8 +6,7 @@ #include "common/common_types.h" #include "common/swap.h" - -#include "video_core/math.h" +#include "common/vector_math.h" namespace Color { diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index b92cd1a7e..5392dae21 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -19,9 +19,9 @@ #include "common/assert.h" #include "common/file_util.h" #include "common/math_util.h" +#include "common/vector_math.h" #include "video_core/color.h" -#include "video_core/math.h" #include "video_core/pica.h" #include "video_core/utils.h" #include "video_core/video_core.h" diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h index f361a5385..7926d64ec 100644 --- a/src/video_core/debug_utils/debug_utils.h +++ b/src/video_core/debug_utils/debug_utils.h @@ -12,7 +12,8 @@ #include #include -#include "video_core/math.h" +#include "common/vector_math.h" + #include "video_core/pica.h" namespace Pica { diff --git a/src/video_core/pica.h b/src/video_core/pica.h index 6ebeb08f7..c556def03 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h @@ -15,8 +15,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/logging/log.h" - -#include "math.h" +#include "common/vector_math.h" namespace Pica { diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 6f88a8b21..2e4110a88 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -4,13 +4,13 @@ #include "common/make_unique.h" #include "common/math_util.h" +#include "common/vector_math.h" #include "core/memory.h" #include "video_core/renderer_opengl/gl_rasterizer_cache.h" #include "video_core/renderer_opengl/pica_to_gl.h" #include "video_core/debug_utils/debug_utils.h" -#include "video_core/math.h" RasterizerCacheOpenGL::~RasterizerCacheOpenGL() { FullFlush(); From 76690392bf8923d7172936836d15e3caebb26cf0 Mon Sep 17 00:00:00 2001 From: archshift Date: Sun, 24 May 2015 12:20:31 -0700 Subject: [PATCH 2/2] Move video_core/color.h to common/color.h --- src/citra_qt/debugger/graphics_framebuffer.cpp | 3 ++- src/common/CMakeLists.txt | 1 + src/{video_core => common}/color.h | 0 src/core/hw/gpu.cpp | 2 +- src/video_core/CMakeLists.txt | 1 - src/video_core/debug_utils/debug_utils.cpp | 2 +- src/video_core/rasterizer.cpp | 2 +- src/video_core/renderer_opengl/gl_rasterizer.cpp | 3 ++- 8 files changed, 8 insertions(+), 6 deletions(-) rename src/{video_core => common}/color.h (100%) 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 #include +#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 similarity index 100% rename from src/video_core/color.h rename to 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 #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 +#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"