diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5986403a05..254acf3daa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1432,6 +1432,8 @@ add_library(${CoreLibName} ${CoreLinkType}
Core/Screenshot.h
Core/System.cpp
Core/System.h
+ Core/TextureReplacer.cpp
+ Core/TextureReplacer.h
Core/Util/AudioFormat.cpp
Core/Util/AudioFormat.h
Core/Util/GameManager.cpp
@@ -1491,8 +1493,6 @@ add_library(GPU OBJECT
GPU/Common/TextureDecoder.h
GPU/Common/TextureCacheCommon.cpp
GPU/Common/TextureCacheCommon.h
- GPU/Common/TextureReplacer.cpp
- GPU/Common/TextureReplacer.h
GPU/Common/TextureScalerCommon.cpp
GPU/Common/TextureScalerCommon.h
${GPU_NEON}
diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj
index 514cf98e74..6f255870a5 100644
--- a/Core/Core.vcxproj
+++ b/Core/Core.vcxproj
@@ -181,6 +181,7 @@
+
@@ -506,6 +507,7 @@
+
diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters
index 76cce1b921..4d22852e1f 100644
--- a/Core/Core.vcxproj.filters
+++ b/Core/Core.vcxproj.filters
@@ -631,6 +631,9 @@
FileLoaders
+
+ Core
+
@@ -1176,6 +1179,9 @@
FileLoaders
+
+ Core
+
diff --git a/GPU/Common/TextureReplacer.cpp b/Core/TextureReplacer.cpp
similarity index 97%
rename from GPU/Common/TextureReplacer.cpp
rename to Core/TextureReplacer.cpp
index adc6c737bc..dbecb4d128 100644
--- a/GPU/Common/TextureReplacer.cpp
+++ b/Core/TextureReplacer.cpp
@@ -16,8 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#ifndef USING_QT_UI
-// TODO: Make this and change the include path? Or move to Core?
-#include "ext/libpng17/png.h"
+#include
#endif
#include "ext/xxhash.h"
@@ -25,9 +24,9 @@
#include "Common/FileUtil.h"
#include "Core/Config.h"
#include "Core/System.h"
+#include "Core/TextureReplacer.h"
#include "Core/ELF/ParamSFO.h"
#include "GPU/Common/TextureDecoder.h"
-#include "GPU/Common/TextureReplacer.h"
TextureReplacer::TextureReplacer() : enabled_(false) {
}
diff --git a/GPU/Common/TextureReplacer.h b/Core/TextureReplacer.h
similarity index 100%
rename from GPU/Common/TextureReplacer.h
rename to Core/TextureReplacer.h
diff --git a/GPU/Common/TextureCacheCommon.h b/GPU/Common/TextureCacheCommon.h
index 17da5fbf76..6dcec60e5b 100644
--- a/GPU/Common/TextureCacheCommon.h
+++ b/GPU/Common/TextureCacheCommon.h
@@ -22,8 +22,8 @@
#include "Common/CommonTypes.h"
#include "Common/MemoryUtil.h"
+#include "Core/TextureReplacer.h"
#include "GPU/Common/GPUDebugInterface.h"
-#include "GPU/Common/TextureReplacer.h"
enum TextureFiltering {
TEX_FILTER_AUTO = 1,
diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj
index 1c6733df42..5b49067da8 100644
--- a/GPU/GPU.vcxproj
+++ b/GPU/GPU.vcxproj
@@ -199,7 +199,6 @@
true
-
@@ -276,7 +275,6 @@
true
-
diff --git a/GPU/GPU.vcxproj.filters b/GPU/GPU.vcxproj.filters
index 2ebdc39247..9818d21e92 100644
--- a/GPU/GPU.vcxproj.filters
+++ b/GPU/GPU.vcxproj.filters
@@ -240,9 +240,6 @@
Vulkan
-
- Common
-
@@ -464,8 +461,5 @@
Vulkan
-
- Common
-
diff --git a/Qt/GPU.pro b/Qt/GPU.pro
index ba4f607bf3..e993b64b5a 100644
--- a/Qt/GPU.pro
+++ b/Qt/GPU.pro
@@ -54,7 +54,6 @@ SOURCES += $$P/GPU/GeDisasm.cpp \ # GPU
$$P/GPU/Common/TextureScalerCommon.cpp \
$$P/GPU/Common/VertexDecoderCommon.cpp \
$$P/GPU/Common/TextureCacheCommon.cpp \
- $$P/GPU/Common/TextureReplacer.cpp \
$$P/GPU/Common/TransformCommon.cpp \
$$P/GPU/Common/SoftwareTransformCommon.cpp \
$$P/GPU/Common/PostShader.cpp \
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 8f00efe94c..82f5adb187 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -207,7 +207,6 @@ EXEC_AND_LIB_FILES := \
$(SRC)/GPU/Common/SoftwareTransformCommon.cpp.arm \
$(SRC)/GPU/Common/VertexDecoderCommon.cpp.arm \
$(SRC)/GPU/Common/TextureCacheCommon.cpp.arm \
- $(SRC)/GPU/Common/TextureReplacer.cpp \
$(SRC)/GPU/Common/TextureScalerCommon.cpp.arm \
$(SRC)/GPU/Common/SplineCommon.cpp.arm \
$(SRC)/GPU/Common/DrawEngineCommon.cpp.arm \
@@ -269,6 +268,7 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Core/SaveState.cpp \
$(SRC)/Core/Screenshot.cpp \
$(SRC)/Core/System.cpp \
+ $(SRC)/Core/TextureReplacer.cpp \
$(SRC)/Core/Debugger/Breakpoints.cpp \
$(SRC)/Core/Debugger/SymbolMap.cpp \
$(SRC)/Core/Dialog/PSPDialog.cpp \