aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar archshift <gh@archshift.com>2015-05-24 12:16:22 -0700
committerGravatar archshift <gh@archshift.com>2015-05-30 11:17:36 -0700
commit5df2d1b5f75e0ee2d3fce7131fcee5dc8e1d7cc4 (patch)
tree1a26ca3a3015ce6415a6ae48dca17ed0eeb2d252 /src
parent8a04c65e20ba1f5c472c026b7a558e1d54324306 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.cpp4
-rw-r--r--src/common/CMakeLists.txt1
-rw-r--r--src/common/vector_math.h (renamed from src/video_core/math.h)0
-rw-r--r--src/video_core/CMakeLists.txt1
-rw-r--r--src/video_core/color.h3
-rw-r--r--src/video_core/debug_utils/debug_utils.cpp2
-rw-r--r--src/video_core/debug_utils/debug_utils.h3
-rw-r--r--src/video_core/pica.h3
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp2
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 804c735a..cabf5fe0 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics_cmdlists.cpp
@@ -11,10 +11,10 @@
#include <QSpinBox>
#include <QComboBox>
-#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 dbaaac77..d1c306d3 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
index 4928c9bf..4928c9bf 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 0258a325..f50f73b5 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 4d2026eb..422fdc8a 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 b92cd1a7..5392dae2 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 f361a538..7926d64e 100644
--- a/src/video_core/debug_utils/debug_utils.h
+++ b/src/video_core/debug_utils/debug_utils.h
@@ -12,7 +12,8 @@
#include <mutex>
#include <vector>
-#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 6ebeb08f..c556def0 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 6f88a8b2..2e4110a8 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();