summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2017-03-05 09:45:29 -0500
committerGitHub <noreply@github.com>2017-03-05 09:45:29 -0500
commit7fa14169e9aafd011cbb658e32a259e701812be0 (patch)
tree5f6d42ff9278c5c8eb0b4e14a7f753395bd55a80 /Source/Core/VideoCommon
parentc2594695b8beda137c808e666b0651a1f09a293c (diff)
parent552c0d8404ebd1e0cfa71c2d14ecb81c40f4cd70 (diff)
Merge pull request #5007 from lioncash/swap
Common: Move byte swapping utilities into their own header
Diffstat (limited to 'Source/Core/VideoCommon')
-rw-r--r--Source/Core/VideoCommon/DataReader.h3
-rw-r--r--Source/Core/VideoCommon/HiresTextures.cpp4
-rw-r--r--Source/Core/VideoCommon/TextureDecoder_Common.cpp3
-rw-r--r--Source/Core/VideoCommon/TextureDecoder_Generic.cpp3
-rw-r--r--Source/Core/VideoCommon/TextureDecoder_x64.cpp2
-rw-r--r--Source/Core/VideoCommon/VertexLoader_Color.cpp3
-rw-r--r--Source/Core/VideoCommon/VertexLoader_Normal.cpp5
-rw-r--r--Source/Core/VideoCommon/VertexLoader_Normal.h1
-rw-r--r--Source/Core/VideoCommon/VertexLoader_Position.cpp6
-rw-r--r--Source/Core/VideoCommon/VertexLoader_Position.h1
-rw-r--r--Source/Core/VideoCommon/VertexLoader_TextCoord.cpp6
-rw-r--r--Source/Core/VideoCommon/VertexLoader_TextCoord.h1
-rw-r--r--Source/Core/VideoCommon/XFStructs.cpp4
13 files changed, 29 insertions, 13 deletions
diff --git a/Source/Core/VideoCommon/DataReader.h b/Source/Core/VideoCommon/DataReader.h
index 08c02d64ba..51430d508d 100644
--- a/Source/Core/VideoCommon/DataReader.h
+++ b/Source/Core/VideoCommon/DataReader.h
@@ -5,9 +5,10 @@
#pragma once
#include <cstring>
+
#include "Common/Common.h"
-#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
+#include "Common/Swap.h"
class DataReader
{
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp
index e9589f7218..e18931db9c 100644
--- a/Source/Core/VideoCommon/HiresTextures.cpp
+++ b/Source/Core/VideoCommon/HiresTextures.cpp
@@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
+#include "VideoCommon/HiresTextures.h"
+
#include <SOIL/SOIL.h>
#include <algorithm>
#include <cinttypes>
@@ -22,10 +24,10 @@
#include "Common/Logging/Log.h"
#include "Common/MemoryUtil.h"
#include "Common/StringUtil.h"
+#include "Common/Swap.h"
#include "Common/Thread.h"
#include "Common/Timer.h"
#include "Core/ConfigManager.h"
-#include "VideoCommon/HiresTextures.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VideoConfig.h"
diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp
index 7f151b2406..cad1a918e3 100644
--- a/Source/Core/VideoCommon/TextureDecoder_Common.cpp
+++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp
@@ -5,9 +5,10 @@
#include <algorithm>
#include <cmath>
-#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
+#include "Common/Swap.h"
+
#include "VideoCommon/LookUpTables.h"
#include "VideoCommon/TextureDecoder.h"
#include "VideoCommon/TextureDecoder_Util.h"
diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
index eb7ed141ef..cf89cf2632 100644
--- a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
+++ b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
@@ -6,8 +6,9 @@
#include <cmath>
#include "Common/CPUDetect.h"
-#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
+#include "Common/Swap.h"
+
#include "VideoCommon/LookUpTables.h"
#include "VideoCommon/TextureDecoder.h"
#include "VideoCommon/TextureDecoder_Util.h"
diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
index 4697e8ba1b..3d5da590f5 100644
--- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp
+++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
@@ -7,10 +7,10 @@
#include <cstring>
#include "Common/CPUDetect.h"
-#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/Intrinsics.h"
#include "Common/MsgHandler.h"
+#include "Common/Swap.h"
#include "VideoCommon/LookUpTables.h"
#include "VideoCommon/TextureDecoder.h"
diff --git a/Source/Core/VideoCommon/VertexLoader_Color.cpp b/Source/Core/VideoCommon/VertexLoader_Color.cpp
index 8ae672f6e0..7a87519bd3 100644
--- a/Source/Core/VideoCommon/VertexLoader_Color.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Color.cpp
@@ -4,8 +4,9 @@
#include <cstring>
-#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
+#include "Common/Swap.h"
+
#include "VideoCommon/VertexLoader.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexLoaderUtils.h"
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
index c780d88cf7..305fd85a6e 100644
--- a/Source/Core/VideoCommon/VertexLoader_Normal.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
@@ -2,17 +2,18 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
+#include "VideoCommon/VertexLoader_Normal.h"
+
#include <cmath>
#include <type_traits>
#include "Common/Common.h"
-#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
+
#include "VideoCommon/DataReader.h"
#include "VideoCommon/VertexLoader.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexLoaderUtils.h"
-#include "VideoCommon/VertexLoader_Normal.h"
// warning: mapping buffer should be disabled to use this
#define LOG_NORM() // PRIM_LOG("norm: %f %f %f, ", ((float*)g_vertex_manager_write_ptr)[-3],
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.h b/Source/Core/VideoCommon/VertexLoader_Normal.h
index 811d2d05a7..5b91615761 100644
--- a/Source/Core/VideoCommon/VertexLoader_Normal.h
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.h
@@ -5,6 +5,7 @@
#pragma once
#include "Common/CommonTypes.h"
+#include "VideoCommon/VertexLoader.h"
class VertexLoader_Normal
{
diff --git a/Source/Core/VideoCommon/VertexLoader_Position.cpp b/Source/Core/VideoCommon/VertexLoader_Position.cpp
index 4b52861122..86f1e76e36 100644
--- a/Source/Core/VideoCommon/VertexLoader_Position.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Position.cpp
@@ -2,16 +2,18 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
+#include "VideoCommon/VertexLoader_Position.h"
+
#include <limits>
#include <type_traits>
-#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
+#include "Common/Swap.h"
+
#include "VideoCommon/DataReader.h"
#include "VideoCommon/VertexLoader.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexLoaderUtils.h"
-#include "VideoCommon/VertexLoader_Position.h"
#include "VideoCommon/VideoCommon.h"
template <typename T>
diff --git a/Source/Core/VideoCommon/VertexLoader_Position.h b/Source/Core/VideoCommon/VertexLoader_Position.h
index b34542128f..1a8a2855e3 100644
--- a/Source/Core/VideoCommon/VertexLoader_Position.h
+++ b/Source/Core/VideoCommon/VertexLoader_Position.h
@@ -5,6 +5,7 @@
#pragma once
#include "Common/CommonTypes.h"
+#include "VideoCommon/VertexLoader.h"
class VertexLoader_Position
{
diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
index aa4e87415c..99d3a797ec 100644
--- a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
@@ -2,15 +2,17 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
+#include "VideoCommon/VertexLoader_TextCoord.h"
+
#include <type_traits>
-#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
+#include "Common/Swap.h"
+
#include "VideoCommon/DataReader.h"
#include "VideoCommon/VertexLoader.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexLoaderUtils.h"
-#include "VideoCommon/VertexLoader_TextCoord.h"
template <int N>
void LOG_TEX();
diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.h b/Source/Core/VideoCommon/VertexLoader_TextCoord.h
index fe04e5670f..1b135e46d3 100644
--- a/Source/Core/VideoCommon/VertexLoader_TextCoord.h
+++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.h
@@ -5,6 +5,7 @@
#pragma once
#include "Common/CommonTypes.h"
+#include "VideoCommon/VertexLoader.h"
class VertexLoader_TextCoord
{
diff --git a/Source/Core/VideoCommon/XFStructs.cpp b/Source/Core/VideoCommon/XFStructs.cpp
index abe35ed422..9a2db74459 100644
--- a/Source/Core/VideoCommon/XFStructs.cpp
+++ b/Source/Core/VideoCommon/XFStructs.cpp
@@ -2,10 +2,12 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
-#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
+#include "Common/Swap.h"
+
#include "Core/HW/Memmap.h"
+
#include "VideoCommon/CPMemory.h"
#include "VideoCommon/DataReader.h"
#include "VideoCommon/Fifo.h"