diff options
| -rw-r--r-- | src/citra_qt/debugger/graphics_cmdlists.cpp | 4 | ||||
| -rw-r--r-- | src/common/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/common/vector_math.h (renamed from src/video_core/math.h) | 0 | ||||
| -rw-r--r-- | src/video_core/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/video_core/color.h | 3 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.h | 3 | ||||
| -rw-r--r-- | src/video_core/pica.h | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 2 |
9 files changed, 9 insertions, 10 deletions
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 @@ | |||
| 11 | #include <QSpinBox> | 11 | #include <QSpinBox> |
| 12 | #include <QComboBox> | 12 | #include <QComboBox> |
| 13 | 13 | ||
| 14 | #include "video_core/pica.h" | 14 | #include "common/vector_math.h" |
| 15 | #include "video_core/math.h" | ||
| 16 | 15 | ||
| 17 | #include "video_core/debug_utils/debug_utils.h" | 16 | #include "video_core/debug_utils/debug_utils.h" |
| 17 | #include "video_core/pica.h" | ||
| 18 | 18 | ||
| 19 | #include "graphics_cmdlists.h" | 19 | #include "graphics_cmdlists.h" |
| 20 | 20 | ||
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 | |||
| 54 | thread_queue_list.h | 54 | thread_queue_list.h |
| 55 | thunk.h | 55 | thunk.h |
| 56 | timer.h | 56 | timer.h |
| 57 | vector_math.h | ||
| 57 | ) | 58 | ) |
| 58 | 59 | ||
| 59 | create_directory_groups(${SRCS} ${HEADERS}) | 60 | create_directory_groups(${SRCS} ${HEADERS}) |
diff --git a/src/video_core/math.h b/src/common/vector_math.h index 4928c9bf2..4928c9bf2 100644 --- a/src/video_core/math.h +++ b/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 | |||
| 33 | command_processor.h | 33 | command_processor.h |
| 34 | gpu_debugger.h | 34 | gpu_debugger.h |
| 35 | hwrasterizer_base.h | 35 | hwrasterizer_base.h |
| 36 | math.h | ||
| 37 | pica.h | 36 | pica.h |
| 38 | primitive_assembly.h | 37 | primitive_assembly.h |
| 39 | rasterizer.h | 38 | 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 @@ | |||
| 6 | 6 | ||
| 7 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 8 | #include "common/swap.h" | 8 | #include "common/swap.h" |
| 9 | 9 | #include "common/vector_math.h" | |
| 10 | #include "video_core/math.h" | ||
| 11 | 10 | ||
| 12 | namespace Color { | 11 | namespace Color { |
| 13 | 12 | ||
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 @@ | |||
| 19 | #include "common/assert.h" | 19 | #include "common/assert.h" |
| 20 | #include "common/file_util.h" | 20 | #include "common/file_util.h" |
| 21 | #include "common/math_util.h" | 21 | #include "common/math_util.h" |
| 22 | #include "common/vector_math.h" | ||
| 22 | 23 | ||
| 23 | #include "video_core/color.h" | 24 | #include "video_core/color.h" |
| 24 | #include "video_core/math.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/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 @@ | |||
| 12 | #include <mutex> | 12 | #include <mutex> |
| 13 | #include <vector> | 13 | #include <vector> |
| 14 | 14 | ||
| 15 | #include "video_core/math.h" | 15 | #include "common/vector_math.h" |
| 16 | |||
| 16 | #include "video_core/pica.h" | 17 | #include "video_core/pica.h" |
| 17 | 18 | ||
| 18 | namespace Pica { | 19 | 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 @@ | |||
| 15 | #include "common/common_funcs.h" | 15 | #include "common/common_funcs.h" |
| 16 | #include "common/common_types.h" | 16 | #include "common/common_types.h" |
| 17 | #include "common/logging/log.h" | 17 | #include "common/logging/log.h" |
| 18 | 18 | #include "common/vector_math.h" | |
| 19 | #include "math.h" | ||
| 20 | 19 | ||
| 21 | namespace Pica { | 20 | namespace Pica { |
| 22 | 21 | ||
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 @@ | |||
| 4 | 4 | ||
| 5 | #include "common/make_unique.h" | 5 | #include "common/make_unique.h" |
| 6 | #include "common/math_util.h" | 6 | #include "common/math_util.h" |
| 7 | #include "common/vector_math.h" | ||
| 7 | 8 | ||
| 8 | #include "core/memory.h" | 9 | #include "core/memory.h" |
| 9 | 10 | ||
| 10 | #include "video_core/renderer_opengl/gl_rasterizer_cache.h" | 11 | #include "video_core/renderer_opengl/gl_rasterizer_cache.h" |
| 11 | #include "video_core/renderer_opengl/pica_to_gl.h" | 12 | #include "video_core/renderer_opengl/pica_to_gl.h" |
| 12 | #include "video_core/debug_utils/debug_utils.h" | 13 | #include "video_core/debug_utils/debug_utils.h" |
| 13 | #include "video_core/math.h" | ||
| 14 | 14 | ||
| 15 | RasterizerCacheOpenGL::~RasterizerCacheOpenGL() { | 15 | RasterizerCacheOpenGL::~RasterizerCacheOpenGL() { |
| 16 | FullFlush(); | 16 | FullFlush(); |