Texture pack support

CMakeLists.txt

@@ -7,6 +7,7 @@ if(CCACHE_PROGRAM)
 endif()
 
 set(SENTRY_UPLOAD_URL "" CACHE STRING "Sentry upload URL")
+set(GDXSV_TEXTURE_PACK_PASS "" CACHE STRING "Gdxsv texture pack password")
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/shell/cmake")
 
@@ -254,6 +255,10 @@ if(NOT "${SENTRY_UPLOAD_URL}" STREQUAL "")
 	target_compile_definitions(${PROJECT_NAME} PRIVATE SENTRY_UPLOAD="${SENTRY_UPLOAD_URL}")
 endif()
 
+if(NOT "${GDXSV_TEXTURE_PACK_PASS}" STREQUAL "")
+	target_compile_definitions(${PROJECT_NAME} PRIVATE GDXSV_TEXTURE_PACK_PASS="${GDXSV_TEXTURE_PACK_PASS}")
+endif()
+
 target_include_directories(${PROJECT_NAME} PRIVATE core core/deps core/deps/stb core/deps/khronos core/deps/json)
 if(LIBRETRO)
 	target_include_directories(${PROJECT_NAME} PRIVATE shell/libretro)
@@ -2075,8 +2080,8 @@ target_sources(${PROJECT_NAME} PRIVATE
 		core/gdxsv/gdxsv.h
 		core/gdxsv/gdxsv.pb.cc
 		core/gdxsv/gdxsv.pb.h
-		core/gdxsv/gdxsv_CustomTexture.cpp
-		core/gdxsv/gdxsv_CustomTexture.h
+		core/gdxsv/gdxsv_custom_texture_source.cpp
+		core/gdxsv/gdxsv_custom_texture_source.h
 		core/gdxsv/gdxsv_backend_replay.cpp
 		core/gdxsv/gdxsv_backend_replay.h
 		core/gdxsv/gdxsv_backend_rollback.cpp

core/cfg/option.cpp

@@ -141,6 +141,7 @@ Option<float> ProfilerFrameWarningTime("Profiler.FrameWarningTime", 1.0f / 55.0f
 Option<std::string> GdxLobbyServer("server", "zdxsv.net", "gdxsv");
 Option<std::string> GdxLoginKey("loginkey", "", "gdxsv");
 Option<int> GdxLanguage("language", -1, "gdxsv");
+Option<bool> GdxUseTexturePack("UseTexturePack", false, "gdxsv");
 Option<int> GdxLocalPort("LocalPort", 0, "gdxsv");
 Option<int> GdxMinDelay("MinDelay", 2, "gdxsv");
 Option<bool> GdxSaveReplay("SaveReplay", true, "gdxsv");

core/cfg/option.h

@@ -499,6 +499,7 @@ extern Option<float> ProfilerFrameWarningTime;
 extern Option<std::string> GdxLobbyServer;
 extern Option<std::string> GdxLoginKey;
 extern Option<int> GdxLanguage;
+extern Option<bool> GdxUseTexturePack;
 extern Option<int> GdxLocalPort;
 extern Option<int> GdxMinDelay;
 extern Option<bool> GdxSaveReplay;

core/emulator.cpp

@@ -46,7 +46,6 @@
 #include <chrono>
 
 #include "gdxsv/gdxsv_emu_hooks.h"
-#include "gdxsv/gdxsv_CustomTexture.h"
 
 settings_t settings;
 constexpr float WINCE_DEPTH_SCALE = 0.01f;
@@ -702,9 +701,6 @@ void Emulator::unloadGame()
 		state = Init;
 		EventManager::event(Event::Terminate);
 	}
-#if defined(__APPLE__) || defined(_WIN32)
-	gdx_custom_texture.Terminate();
-#endif
 }
 
 void Emulator::term()
@@ -715,9 +711,6 @@ void Emulator::term()
 		debugger::term();
 		sh4_cpu.Term();
 		custom_texture.Terminate();	// lr: avoid deadlock on exit (win32)
-#if defined(__APPLE__) || defined(_WIN32)
-		gdx_custom_texture.Terminate();
-#endif
 		reios_term();
 		aica::term();
 		pvr::term();
@@ -815,9 +808,6 @@ void Emulator::stepRange(u32 from, u32 to)
 void dc_loadstate(Deserializer& deser)
 {
 	custom_texture.Terminate();
-#if defined(__APPLE__) || defined(_WIN32)
-	gdx_custom_texture.Terminate();
-#endif
 #if FEAT_AREC == DYNAREC_JIT
 	aica::arm::recompiler::flush();
 #endif