diff --git a/.travis.sh b/.travis.sh
index e0612c77c8..ba952065d9 100644
--- a/.travis.sh
+++ b/.travis.sh
@@ -106,6 +106,8 @@ travis_script() {
 
         if [ "$QT" = "TRUE" ]; then
             ./b.sh --qt
+        elif [ "$LIBRETRO" = "TRUE" ]; then
+            ./b.sh --libretro
         else
             ./b.sh --headless
         fi
diff --git a/.travis.yml b/.travis.yml
index 11d1ae698c..58fd835d41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,6 +64,14 @@ matrix:
       compiler: "gcc"
       env: PPSSPP_BUILD_TYPE=Linux
            QT=TRUE
+    - os: linux
+      compiler: "gcc"
+      env: PPSSPP_BUILD_TYPE=Linux
+           LIBRETRO=TRUE
+    - os: linux
+      compiler: "clang"
+      env: PPSSPP_BUILD_TYPE=Linux
+           LIBRETRO=TRUE
     - os: osx
       osx_image: xcode8
       compiler: "clang macos"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6f573c77f..ff1f78a1d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,11 @@ include(ccache)
 # Remove soon?
 set(USE_FFMPEG ON)
 
+# the libraries in the ffmpeg/ directory are not compatible with mingw
+if(MINGW AND NOT DEFINED USE_SYSTEM_FFMPEG)
+	set(USE_SYSTEM_FFMPEG ON)
+endif()
+
 if(NOT ANDROID AND NOT IOS)
 	if(ARM OR SIMULATOR)
 		set(USING_EGL ON)
@@ -110,6 +115,7 @@ option(MOBILE_DEVICE "Set to ON when targeting a mobile device" ${MOBILE_DEVICE}
 option(HEADLESS "Set to OFF to not generate the PPSSPPHeadless target" ${HEADLESS})
 option(UNITTEST "Set to ON to generate the unittest target" ${UNITTEST})
 option(SIMULATOR "Set to ON when targeting an x86 simulator of an ARM platform" ${SIMULATOR})
+option(LIBRETRO "Set to ON to generate the libretro target" OFF)
 # :: Options
 option(USE_FFMPEG "Build with FFMPEG support" ${USE_FFMPEG})
 option(USE_SYSTEM_FFMPEG "Dynamically link against system FFMPEG" ${USE_SYSTEM_FFMPEG})
@@ -130,6 +136,14 @@ if(UNIX AND NOT (APPLE OR ANDROID) AND VULKAN)
 	endif()
 endif()
 
+if(LIBRETRO)
+	add_definitions(-D__LIBRETRO__)
+	add_definitions(-DGLEW_NO_GLU)
+	if(NOT MSVC)
+		add_compile_options(-fPIC)
+	endif()
+endif()
+
 if(ANDROID)
 	set(CoreLibName ppsspp_jni)
 	set(CoreLinkType SHARED)
@@ -243,7 +257,7 @@ if(NOT MSVC)
 	add_definitions(-Wno-deprecated-register)
 
 	# Don't compile with strict aliasing, we're not 100% aliasing-safe
-	add_definitions(-fno-strict-aliasing)
+	add_compile_options(-fno-strict-aliasing)
 	if (${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -parallel -fopenmp")
 	endif()
@@ -273,13 +287,16 @@ if(NOT MSVC)
 else()
 	# Disable warnings about MS-specific _s variants of libc functions
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-	add_definitions(-D_UNICODE -DUNICODE)
-	add_definitions(-DUSING_WIN_UI)
 	add_definitions(-MP)
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_NDEBUG")
 endif()
 
+if(WIN32)
+	add_definitions(-D_UNICODE -DUNICODE)
+	add_definitions(-DUSING_WIN_UI)
+endif()
+
 if(NOT ANDROID)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
@@ -419,7 +436,15 @@ target_link_libraries(Common Ext::Snappy)
 
 if(WIN32)
 	include_directories(dx9sdk/Include)
-	target_link_libraries(Common winmm d3d9 dxguid dsound)
+	include_directories(dx9sdk/Include/DX11)
+	if(MINGW)
+		set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <INCLUDES> <SOURCE> <OBJECT>")
+		# required when using the dx9sdk include paths
+		add_definitions(-include ${CMAKE_CURRENT_SOURCE_DIR}/Windows/mingw_defines.h)
+	else()
+		target_link_libraries(Common dxguid)
+	endif()
+	target_link_libraries(Common winmm d3d9 dsound)
 endif()
 
 if(TARGET SDL2::SDL2)
@@ -772,24 +797,6 @@ elseif(USING_QT_UI)
         set(nativeExtraLibs ${nativeExtraLibs} Qt5::Multimedia)
     endif()
 
-elseif(TARGET SDL2::SDL2)
-	set(TargetBin PPSSPPSDL)
-	# Require SDL
-	add_definitions(-DSDL)
-	set(nativeExtra ${nativeExtra}
-		SDL/SDLJoystick.h
-		SDL/SDLJoystick.cpp
-		SDL/SDLMain.cpp
-		SDL/SDLGLGraphicsContext.cpp
-		SDL/SDLVulkanGraphicsContext.cpp)
-	set(nativeExtraLibs ${nativeExtraLibs} SDL2::SDL2)
-	if(APPLE)
-		set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm)
-		set(nativeExtraLibs ${nativeExtraLibs} ${COCOA_LIBRARY})
-	elseif(USING_EGL)
-		set(nativeExtraLibs ${nativeExtraLibs} pthread)
-	endif()
-	set(TargetBin PPSSPPSDL)
 elseif(WIN32)
 	# Don't care about SDL.
 	set(TargetBin PPSSPPWindows)
@@ -798,6 +805,25 @@ elseif(WIN32)
 	else()
 		link_directories(dx9sdk/Lib/x86)
 	endif()
+   set(nativeExtra ${nativeExtra} ext/native/base/logging.cpp)
+elseif(TARGET SDL2::SDL2)
+   set(TargetBin PPSSPPSDL)
+   # Require SDL
+   add_definitions(-DSDL)
+   set(nativeExtra ${nativeExtra}
+      SDL/SDLJoystick.h
+      SDL/SDLJoystick.cpp
+      SDL/SDLMain.cpp
+      SDL/SDLGLGraphicsContext.cpp
+      SDL/SDLVulkanGraphicsContext.cpp)
+   set(nativeExtraLibs ${nativeExtraLibs} SDL2::SDL2)
+   if(APPLE)
+      set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm)
+      set(nativeExtraLibs ${nativeExtraLibs} ${COCOA_LIBRARY})
+   elseif(USING_EGL)
+      set(nativeExtraLibs ${nativeExtraLibs} pthread)
+   endif()
+   set(TargetBin PPSSPPSDL)
 else()
 	message(FATAL_ERROR "Could not find SDL2. Failing.")
 endif()
@@ -1031,7 +1057,7 @@ if(ANDROID)
 	SET(ATOMIC_LIB atomic)
 endif()
 
-target_link_libraries(native ${LIBZIP_LIBRARY} ${ZLIB_LIBRARY} ${PNG_LIBRARY} rg_etc1 vjson udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB})
+target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARY} ${ZLIB_LIBRARY} rg_etc1 vjson udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB})
 if(TARGET Ext::GLEW)
   target_link_libraries(native Ext::GLEW)
 endif()
@@ -1080,7 +1106,7 @@ include_directories(ext/xxhash)
 set(CoreExtra)
 set(CoreExtraLibs)
 
-if(WINDOWS OR ANDROID)
+if(WIN32 OR ANDROID)
 	set(CoreExtraLibs ${CoreExtraLibs} armips)
 endif()
 
@@ -1689,6 +1715,10 @@ set(CoreExtraLibs ${CoreExtraLibs} armips)
 
 set(GlslangLibs glslang OGLCompiler OSDependent SPIRV SPVRemapper spirv-cross-glsl)
 
+if(WIN32)
+   set(GlslangLibs ${GlslangLibs} spirv-cross-hlsl)
+endif()
+
 target_link_libraries(${CoreLibName} Common native kirk cityhash sfmt19937 xbrz xxhash ${GlslangLibs}
 	${CoreExtraLibs} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${CMAKE_DL_LIBS})
 
@@ -1700,6 +1730,7 @@ if(FFmpeg_FOUND)
     FFmpeg::avutil
     FFmpeg::swresample
     FFmpeg::swscale
+    ${ZLIB_LIBRARY}
   )
 endif()
 
@@ -1765,7 +1796,6 @@ set(WindowsFiles
 	Windows/EmuThread.cpp
 	Windows/EmuThread.h
 	Windows/GeDebugger/GeDebugger.cpp
-	Windows/Globals.cpp
 	Windows/GPU/D3D9Context.cpp
 	Windows/GPU/D3D9Context.h
 	Windows/GPU/D3D11Context.cpp
@@ -1813,7 +1843,7 @@ set(WindowsFiles
 list(APPEND LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT})
 
 if(WIN32)
-	list(APPEND LinkCommon kernel32 user32 gdi32 shell32 comctl32 dsound xinput)
+	list(APPEND LinkCommon kernel32 user32 gdi32 shell32 comctl32 dsound xinput d3d9 winmm dinput8 ole32 winspool ksuser)
 	#setup_target_project(${TargetBin} Windows)
 	list(APPEND NativeAppSource ${WindowsFiles})
 endif()
@@ -1863,6 +1893,10 @@ if(UNITTEST)
 	setup_target_project(unitTest unittest)
 endif()
 
+if(LIBRETRO)
+	add_subdirectory(libretro)
+endif()
+
 if (TargetBin)
 	if (IOS OR APPLE)
 		if (APPLE AND NOT IOS)
@@ -1892,7 +1926,11 @@ if (TargetBin)
 		endif()
 	elseif(WIN32)
 		add_executable(${TargetBin} WIN32 ${NativeAppSource})
-		set_target_properties(${TargetBin} PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
+		if(MSVC)
+			set_target_properties(${TargetBin} PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
+		else()
+			set_target_properties(${TargetBin} PROPERTIES LINK_FLAGS "-Wl,-subsystem,windows")
+		endif()
 		set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TargetBin})
 	else()
 		add_executable(${TargetBin} ${NativeAppSource})
diff --git a/Common/CommonFuncs.h b/Common/CommonFuncs.h
index b8a9aea66d..cfcbbe0e78 100644
--- a/Common/CommonFuncs.h
+++ b/Common/CommonFuncs.h
@@ -61,8 +61,10 @@ inline u64 __rotr64(u64 x, unsigned int shift){
 #else // WIN32
 
 // Function Cross-Compatibility
+#ifndef __MINGW32__
 	#define strcasecmp _stricmp
 	#define strncasecmp _strnicmp
+#endif
 	#define unlink _unlink
 	#define __rotl _rotl
 	#define __rotl64 _rotl64
diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp
index 49d9ce8feb..34491ec49f 100644
--- a/Common/ConsoleListener.cpp
+++ b/Common/ConsoleListener.cpp
@@ -26,6 +26,9 @@
 #else
 #include <stdarg.h>
 #endif
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
 
 #include "ppsspp_config.h"
 #include "thread/threadutil.h"
@@ -67,6 +70,8 @@ ConsoleListener::ConsoleListener() : bHidden(true)
 	bUseColor = false;
 #elif PPSSPP_PLATFORM(UWP)
 	bUseColor = false;
+#elif defined(_MSC_VER)
+	bUseColor = false;
 #else
 	bUseColor = isatty(fileno(stdout));
 #endif
diff --git a/Common/LogManager.cpp b/Common/LogManager.cpp
index 57dde3beff..c138f34533 100644
--- a/Common/LogManager.cpp
+++ b/Common/LogManager.cpp
@@ -176,6 +176,7 @@ void LogManager::ChangeFileLog(const char *filename) {
 	if (fileLog_) {
 		RemoveListener(fileLog_);
 		delete fileLog_;
+		fileLog_ = nullptr;
 	}
 
 	if (filename) {
@@ -245,16 +246,20 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const
 	}
 
 	char msgBuf[1024];
+	va_list args_copy;
+
+	va_copy(args_copy, args);
 	size_t neededBytes = vsnprintf(msgBuf, sizeof(msgBuf), format, args);
 	if (neededBytes > sizeof(msgBuf)) {
 		// Needed more space? Re-run vsnprintf.
 		message.msg.resize(neededBytes + 1);
-		vsnprintf(&message.msg[0], neededBytes + 1, format, args);
+		vsnprintf(&message.msg[0], neededBytes + 1, format, args_copy);
 	} else {
 		message.msg.resize(neededBytes + 1);
 		memcpy(&message.msg[0], msgBuf, neededBytes);
 	}
 	message.msg[message.msg.size() - 1] = '\n';
+	va_end(args_copy);
 
 	std::lock_guard<std::mutex> listeners_lock(listeners_lock_);
 	for (auto &iter : listeners_) {
diff --git a/Common/Misc.cpp b/Common/Misc.cpp
index 460b64c3ee..af573729b9 100644
--- a/Common/Misc.cpp
+++ b/Common/Misc.cpp
@@ -43,13 +43,13 @@ const char *GetLastErrorMsg()
 const char *GetStringErrorMsg(int errCode) {
 	static const size_t buff_size = 1023;
 #ifdef _WIN32
-	static __declspec(thread) wchar_t err_strw[buff_size] = {};
+	static __THREAD wchar_t err_strw[buff_size] = {};
 
 	FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errCode,
 		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 		err_strw, buff_size, NULL);
 
-	static __declspec(thread) char err_str[buff_size] = {};
+	static __THREAD char err_str[buff_size] = {};
 	snprintf(err_str, buff_size, "%s", ConvertWStringToUTF8(err_strw).c_str());
 #else
 	static __thread char err_str[buff_size] = {};
diff --git a/Common/OSVersion.cpp b/Common/OSVersion.cpp
index ef60b85ef5..eaddb29c42 100644
--- a/Common/OSVersion.cpp
+++ b/Common/OSVersion.cpp
@@ -1,6 +1,6 @@
 #include "ppsspp_config.h"
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 #include <cstdint>
 #include "OSVersion.h"
@@ -93,4 +93,4 @@ std::string GetWindowsSystemArchitecture() {
 		return "(Unknown)";
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Common/OSVersion.h b/Common/OSVersion.h
index 2b17d304eb..1f441e412c 100644
--- a/Common/OSVersion.h
+++ b/Common/OSVersion.h
@@ -2,11 +2,11 @@
 
 #include <string>
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 bool IsVistaOrHigher();
 bool DoesVersionMatchWindows(uint32_t major, uint32_t minor, uint32_t spMajor, uint32_t spMinor, bool acceptGreater);
 std::string GetWindowsVersion();
 std::string GetWindowsSystemArchitecture();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Common/Vulkan/VulkanContext.cpp b/Common/Vulkan/VulkanContext.cpp
index 77fa7ed392..5b3da0b7d7 100644
--- a/Common/Vulkan/VulkanContext.cpp
+++ b/Common/Vulkan/VulkanContext.cpp
@@ -640,10 +640,13 @@ void VulkanContext::ReinitSurface(int width, int height) {
 		HINSTANCE connection = (HINSTANCE)winsysData1_;
 		HWND window = (HWND)winsysData2_;
 
-		RECT rc;
-		GetClientRect(window, &rc);
-		width = rc.right - rc.left;
-		height = rc.bottom - rc.top;
+		if (width < 0 || height < 0)
+		{
+			RECT rc;
+			GetClientRect(window, &rc);
+			width = rc.right - rc.left;
+			height = rc.bottom - rc.top;
+		}
 
 		VkWin32SurfaceCreateInfoKHR win32{ VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR };
 		win32.flags = 0;
@@ -1151,6 +1154,10 @@ void VulkanDeleteList::Take(VulkanDeleteList &del) {
 }
 
 void VulkanDeleteList::PerformDeletes(VkDevice device) {
+	for (auto &callback : callbacks_) {
+		callback.func(callback.userdata);
+	}
+	callbacks_.clear();
 	for (auto &cmdPool : cmdPools_) {
 		vkDestroyCommandPool(device, cmdPool, nullptr);
 	}
@@ -1211,8 +1218,4 @@ void VulkanDeleteList::PerformDeletes(VkDevice device) {
 		vkDestroyDescriptorSetLayout(device, descSetLayout, nullptr);
 	}
 	descSetLayouts_.clear();
-	for (auto &callback : callbacks_) {
-		callback.func(callback.userdata);
-	}
-	callbacks_.clear();
 }
diff --git a/Common/Vulkan/VulkanLoader.h b/Common/Vulkan/VulkanLoader.h
index d51d833da5..680fbe46ac 100644
--- a/Common/Vulkan/VulkanLoader.h
+++ b/Common/Vulkan/VulkanLoader.h
@@ -22,8 +22,10 @@
 #elif defined(_WIN32)
 #define VK_USE_PLATFORM_WIN32_KHR
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
 #endif
+#endif
 
 #define VK_NO_PROTOTYPES
 
diff --git a/Common/stdafx.h b/Common/stdafx.h
index 037c0bd0a5..1f18c24ec4 100644
--- a/Common/stdafx.h
+++ b/Common/stdafx.h
@@ -20,16 +20,16 @@
 #ifdef _WIN32
 #ifndef _WIN32_WINNT
 
-#if _MSC_VER < 1700
+#if defined(_MSC_VER) && _MSC_VER < 1700
 #error You need a newer version of Visual Studio.
 #else
-#define _WIN32_WINNT 0x600
+#define _WIN32_WINNT 0x601
 #endif
 
 #endif // #ifndef _WIN32_WINNT
 
 #undef WINVER
-#define WINVER 0x0600
+#define WINVER _WIN32_WINNT
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x0600       // Default value is 0x0400
 #endif
diff --git a/Core/Config.cpp b/Core/Config.cpp
index bf8eb9ee7f..dddf74f981 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -325,6 +325,14 @@ static bool DefaultCodeGen() {
 #endif
 }
 
+static bool DefaultEnableStateUndo() {
+#ifdef MOBILE_DEVICE
+	// Off on mobile to save disk space.
+	return false;
+#endif
+	return true;
+}
+
 struct ConfigSectionSettings {
 	const char *section;
 	ConfigSetting *settings;
@@ -359,6 +367,7 @@ static ConfigSetting generalSettings[] = {
 	ConfigSetting("DumpAudio", &g_Config.bDumpAudio, false),
 	ConfigSetting("SaveLoadResetsAVdumping", &g_Config.bSaveLoadResetsAVdumping, false),
 	ConfigSetting("StateSlot", &g_Config.iCurrentStateSlot, 0, true, true),
+	ConfigSetting("EnableStateUndo", &g_Config.bEnableStateUndo, &DefaultEnableStateUndo, true, true),
 	ConfigSetting("RewindFlipFrequency", &g_Config.iRewindFlipFrequency, 0, true, true),
 
 	ConfigSetting("GridView1", &g_Config.bGridView1, true),
@@ -605,7 +614,7 @@ static bool DefaultShowTouchControls() {
 static const float defaultControlScale = 1.15f;
 
 static ConfigSetting controlSettings[] = {
-	ConfigSetting("HapticFeedback", &g_Config.bHapticFeedback, true, true, true),
+	ConfigSetting("HapticFeedback", &g_Config.bHapticFeedback, false, true, true),
 	ConfigSetting("ShowTouchCross", &g_Config.bShowTouchCross, true, true, true),
 	ConfigSetting("ShowTouchCircle", &g_Config.bShowTouchCircle, true, true, true),
 	ConfigSetting("ShowTouchSquare", &g_Config.bShowTouchSquare, true, true, true),
@@ -928,7 +937,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
 
 	IniFile iniFile;
 	if (!iniFile.Load(iniFilename_)) {
-		ERROR_LOG(LOADER, "Failed to read %s. Setting config to default.", iniFilename_.c_str());
+		ERROR_LOG(LOADER, "Failed to read '%s'. Setting config to default.", iniFilename_.c_str());
 		// Continue anyway to initialize the config.
 	}
 
@@ -1088,7 +1097,7 @@ void Config::Save() {
 		CleanRecent();
 		IniFile iniFile;
 		if (!iniFile.Load(iniFilename_.c_str())) {
-			ERROR_LOG(LOADER, "Error saving config - can't read ini %s", iniFilename_.c_str());
+			ERROR_LOG(LOADER, "Error saving config - can't read ini '%s'", iniFilename_.c_str());
 		}
 
 		// Need to do this somewhere...
@@ -1129,21 +1138,21 @@ void Config::Save() {
 			LogManager::GetInstance()->SaveConfig(log);
 
 		if (!iniFile.Save(iniFilename_.c_str())) {
-			ERROR_LOG(LOADER, "Error saving config - can't write ini %s", iniFilename_.c_str());
+			ERROR_LOG(LOADER, "Error saving config - can't write ini '%s'", iniFilename_.c_str());
 			System_SendMessage("toast", "Failed to save settings!\nCheck permissions, or try to restart the device.");
 			return;
 		}
-		INFO_LOG(LOADER, "Config saved: %s", iniFilename_.c_str());
+		INFO_LOG(LOADER, "Config saved: '%s'", iniFilename_.c_str());
 
 		if (!bGameSpecific) //otherwise we already did this in saveGameConfig()
 		{
 			IniFile controllerIniFile;
 			if (!controllerIniFile.Load(controllerIniFilename_.c_str())) {
-				ERROR_LOG(LOADER, "Error saving config - can't read ini %s", controllerIniFilename_.c_str());
+				ERROR_LOG(LOADER, "Error saving config - can't read ini '%s'", controllerIniFilename_.c_str());
 			}
 			KeyMap::SaveToIni(controllerIniFile);
 			if (!controllerIniFile.Save(controllerIniFilename_.c_str())) {
-				ERROR_LOG(LOADER, "Error saving config - can't write ini %s", controllerIniFilename_.c_str());
+				ERROR_LOG(LOADER, "Error saving config - can't write ini '%s'", controllerIniFilename_.c_str());
 				return;
 			}
 			INFO_LOG(LOADER, "Controller config saved: %s", controllerIniFilename_.c_str());
diff --git a/Core/Config.h b/Core/Config.h
index a486ff3400..b69922d445 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -208,6 +208,7 @@ public:
 	int iMaxRecent;
 	int iCurrentStateSlot;
 	int iRewindFlipFrequency;
+	bool bEnableStateUndo;
 	bool bEnableAutoLoad;
 	bool bEnableCheats;
 	bool bReloadCheats;
diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp
index 5b80b23e79..a37184a45f 100755
--- a/Core/Dialog/PSPSaveDialog.cpp
+++ b/Core/Dialog/PSPSaveDialog.cpp
@@ -15,6 +15,10 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#ifdef __MINGW32__
+#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
+#endif
+
 #include <thread>
 
 #include "i18n/i18n.h"
diff --git a/Core/MIPS/JitCommon/JitCommon.cpp b/Core/MIPS/JitCommon/JitCommon.cpp
index f7792a110c..baf26f6bcc 100644
--- a/Core/MIPS/JitCommon/JitCommon.cpp
+++ b/Core/MIPS/JitCommon/JitCommon.cpp
@@ -77,7 +77,7 @@ namespace MIPSComp {
 	}
 
 }
-#if PPSSPP_PLATFORM(WINDOWS) && !defined(__LIBRETRO__)
+#if PPSSPP_PLATFORM(WINDOWS)
 #define DISASM_ALL 1
 #endif
 
diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp
index 1717fa528e..f3a3bf72f1 100644
--- a/Core/SaveState.cpp
+++ b/Core/SaveState.cpp
@@ -325,30 +325,46 @@ namespace SaveState
 	// Slot utilities
 
 	std::string AppendSlotTitle(const std::string &filename, const std::string &title) {
-		if (!endsWith(filename, std::string(".") + STATE_EXTENSION)) {
-			return title + " (" + filename + ")";
+		char slotChar = 0;
+		auto detectSlot = [&](const std::string &ext) {
+			if (!endsWith(filename, std::string(".") + ext)) {
+				return false;
+			}
+
+			// Usually these are slots, let's check the slot # after the last '_'.
+			size_t slotNumPos = filename.find_last_of('_');
+			if (slotNumPos == filename.npos) {
+				return false;
+			}
+
+			const size_t extLength = ext.length() + 1;
+			// If we take out the extension, '_', etc. we should be left with only a single digit.
+			if (slotNumPos + 1 + extLength != filename.length() - 1) {
+				return false;
+			}
+
+			slotChar = filename[slotNumPos + 1];
+			if (slotChar < '0' || slotChar > '8') {
+				return false;
+			}
+
+			// Change from zero indexed to human friendly.
+			slotChar++;
+			return true;
+		};
+
+		if (detectSlot(STATE_EXTENSION)) {
+			return StringFromFormat("%s (%c)", title.c_str(), slotChar);
+		}
+		if (detectSlot(UNDO_STATE_EXTENSION)) {
+			I18NCategory *sy = GetI18NCategory("System");
+			// Allow the number to be positioned where it makes sense.
+			std::string undo = sy->T("undo %c");
+			return title + " (" + StringFromFormat(undo.c_str(), slotChar) + ")";
 		}
 
-		// Usually these are slots, let's check the slot # after the last '_'.
-		size_t slotNumPos = filename.find_last_of('_');
-		if (slotNumPos == filename.npos) {
-			return title + " (" + filename + ")";
-		}
-
-		const size_t extLength = strlen(STATE_EXTENSION) + 1;
-		// If we take out the extension, '_', etc. we should be left with only a single digit.
-		if (slotNumPos + 1 + extLength != filename.length() - 1) {
-			return title + " (" + filename + ")";
-		}
-
-		std::string slot = filename.substr(slotNumPos + 1, 1);
-		if (slot[0] < '0' || slot[0] > '8') {
-			return title + " (" + filename + ")";
-		}
-
-		// Change from zero indexed to human friendly.
-		slot[0]++;
-		return title + " (" + slot + ")";
+		// Couldn't detect, use the filename.
+		return title + " (" + filename + ")";
 	}
 
 	std::string GetTitle(const std::string &filename) {
@@ -412,11 +428,16 @@ namespace SaveState
 	{
 		std::string fn = GenerateSaveSlotFilename(gameFilename, slot, STATE_EXTENSION);
 		std::string shot = GenerateSaveSlotFilename(gameFilename, slot, SCREENSHOT_EXTENSION);
+		std::string fnUndo = GenerateSaveSlotFilename(gameFilename, slot, UNDO_STATE_EXTENSION);
+		std::string shotUndo = GenerateSaveSlotFilename(gameFilename, slot, UNDO_SCREENSHOT_EXTENSION);
 		if (!fn.empty()) {
 			auto renameCallback = [=](bool status, const std::string &message, void *data) {
 				if (status) {
-					if (File::Exists(fn)) {
-						File::Delete(fn);
+					if (File::Exists(fnUndo) && g_Config.bEnableStateUndo) {
+						File::Delete(fnUndo);
+					}
+					if (File::Exists(fn) && g_Config.bEnableStateUndo) {
+						File::Rename(fn, fnUndo);
 					}
 					File::Rename(fn + ".tmp", fn);
 				}
@@ -425,6 +446,9 @@ namespace SaveState
 				}
 			};
 			// Let's also create a screenshot.
+			if (File::Exists(shot) && g_Config.bEnableStateUndo) {
+				File::Rename(shot, shotUndo);
+			}
 			SaveScreenshot(shot, Callback(), 0);
 			Save(fn + ".tmp", renameCallback, cbUserData);
 		} else {
@@ -434,12 +458,43 @@ namespace SaveState
 		}
 	}
 
+	bool UndoSaveSlot(const std::string &gameFilename, int slot) {
+		std::string fn = GenerateSaveSlotFilename(gameFilename, slot, STATE_EXTENSION);
+		std::string shot = GenerateSaveSlotFilename(gameFilename, slot, SCREENSHOT_EXTENSION);
+		std::string fnUndo = GenerateSaveSlotFilename(gameFilename, slot, UNDO_STATE_EXTENSION);
+		std::string shotUndo = GenerateSaveSlotFilename(gameFilename, slot, UNDO_SCREENSHOT_EXTENSION);
+
+		// Do nothing if there's no undo.
+		if (File::Exists(fnUndo)) {
+			// Swap them so they can undo again to redo.  Mistakes happen.
+			if (File::Exists(shotUndo)) {
+				File::Rename(shot, shot + ".tmp");
+				File::Rename(shotUndo, shot);
+				File::Rename(shot + ".tmp", shotUndo);
+			}
+
+			File::Rename(fn, fn + ".tmp");
+			File::Rename(fnUndo, fn);
+			File::Rename(fn + ".tmp", fnUndo);
+
+			return true;
+		}
+
+		return false;
+	}
+
 	bool HasSaveInSlot(const std::string &gameFilename, int slot)
 	{
 		std::string fn = GenerateSaveSlotFilename(gameFilename, slot, STATE_EXTENSION);
 		return File::Exists(fn);
 	}
 
+	bool HasUndoSaveInSlot(const std::string &gameFilename, int slot)
+	{
+		std::string fn = GenerateSaveSlotFilename(gameFilename, slot, STATE_EXTENSION);
+		return File::Exists(fn + ".undo");
+	}
+
 	bool HasScreenshotInSlot(const std::string &gameFilename, int slot)
 	{
 		std::string fn = GenerateSaveSlotFilename(gameFilename, slot, SCREENSHOT_EXTENSION);
diff --git a/Core/SaveState.h b/Core/SaveState.h
index a4719103af..64c4dbe0c7 100644
--- a/Core/SaveState.h
+++ b/Core/SaveState.h
@@ -28,6 +28,8 @@ namespace SaveState
 	static const int NUM_SLOTS = 5;
 	static const char *STATE_EXTENSION = "ppst";
 	static const char *SCREENSHOT_EXTENSION = "jpg";
+	static const char *UNDO_STATE_EXTENSION = "undo.ppst";
+	static const char *UNDO_SCREENSHOT_EXTENSION = "undo.jpg";
 
 	void Init();
 	void Shutdown();
@@ -36,8 +38,10 @@ namespace SaveState
 	void NextSlot();
 	void SaveSlot(const std::string &gameFilename, int slot, Callback callback, void *cbUserData = 0);
 	void LoadSlot(const std::string &gameFilename, int slot, Callback callback, void *cbUserData = 0);
+	bool UndoSaveSlot(const std::string &gameFilename, int slot);
 	// Checks whether there's an existing save in the specified slot.
 	bool HasSaveInSlot(const std::string &gameFilename, int slot);
+	bool HasUndoSaveInSlot(const std::string &gameFilename, int slot);
 	bool HasScreenshotInSlot(const std::string &gameFilename, int slot);
 
 	int GetCurrentSlot();
diff --git a/Core/TextureReplacer.cpp b/Core/TextureReplacer.cpp
index d6d1b70166..3090df864b 100644
--- a/Core/TextureReplacer.cpp
+++ b/Core/TextureReplacer.cpp
@@ -35,7 +35,7 @@ static const std::string NEW_TEXTURE_DIR = "new/";
 static const int VERSION = 1;
 static const int MAX_MIP_LEVELS = 12;  // 12 should be plenty, 8 is the max mip levels supported by the PSP.
 
-TextureReplacer::TextureReplacer() : enabled_(false), allowVideo_(false), ignoreAddress_(false), hash_(ReplacedTextureHash::QUICK) {
+TextureReplacer::TextureReplacer() {
 	none_.alphaStatus_ = ReplacedTextureAlpha::UNKNOWN;
 }
 
diff --git a/Core/TextureReplacer.h b/Core/TextureReplacer.h
index 4def1506fa..49606c0164 100644
--- a/Core/TextureReplacer.h
+++ b/Core/TextureReplacer.h
@@ -196,13 +196,13 @@ protected:
 	void PopulateReplacement(ReplacedTexture *result, u64 cachekey, u32 hash, int w, int h);
 
 	SimpleBuf<u32> saveBuf;
-	bool enabled_;
-	bool allowVideo_;
-	bool ignoreAddress_;
-	bool reduceHash_;
+	bool enabled_ = false;
+	bool allowVideo_ = false;
+	bool ignoreAddress_ = false;
+	bool reduceHash_ = false;
 	std::string gameID_;
 	std::string basePath_;
-	ReplacedTextureHash hash_;
+	ReplacedTextureHash hash_ = ReplacedTextureHash::QUICK;
 	typedef std::pair<int, int> WidthHeightPair;
 	std::unordered_map<u64, WidthHeightPair> hashranges_;
 	std::unordered_map<ReplacementAliasKey, std::string> aliases_;
diff --git a/GPU/Common/FramebufferCommon.h b/GPU/Common/FramebufferCommon.h
index b6febf7fa3..8e8ffc4f8c 100644
--- a/GPU/Common/FramebufferCommon.h
+++ b/GPU/Common/FramebufferCommon.h
@@ -387,8 +387,8 @@ protected:
 	bool gameUsesSequentialCopies_ = false;
 
 	// Sampled in BeginFrame for safety.
-	float renderWidth_;
-	float renderHeight_;
+	float renderWidth_ = 0.0f;
+	float renderHeight_ = 0.0f;
 	int pixelWidth_;
 	int pixelHeight_;
 	int bloomHack_ = 0;
diff --git a/GPU/Common/PostShader.h b/GPU/Common/PostShader.h
index f069b40d04..068c476641 100644
--- a/GPU/Common/PostShader.h
+++ b/GPU/Common/PostShader.h
@@ -27,7 +27,7 @@
 struct ShaderInfo {
 	std::string iniFile;  // which ini file was this definition in? So we can write settings back later
 	std::string section;  // ini file section. This is saved.
-	std::string name;     // Fancy display name. TODO: Not using yet.
+	std::string name;     // Fancy display name.
 
 	std::string fragmentShaderFile;
 	std::string vertexShaderFile;
diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp
index 05527790ac..aebb32e6e6 100644
--- a/GPU/Common/TextureCacheCommon.cpp
+++ b/GPU/Common/TextureCacheCommon.cpp
@@ -575,23 +575,15 @@ void TextureCacheCommon::DecimateVideos() {
 	}
 }
 
-bool TextureCacheCommon::HandleTextureChange(TexCacheEntry *const entry, const char *reason, bool initialMatch, bool doDelete) {
-	bool replaceImages = false;
-
+void TextureCacheCommon::HandleTextureChange(TexCacheEntry *const entry, const char *reason, bool initialMatch, bool doDelete) {
 	cacheSizeEstimate_ -= EstimateTexMemoryUsage(entry);
 	entry->numInvalidated++;
 	gpuStats.numTextureInvalidations++;
 	DEBUG_LOG(G3D, "Texture different or overwritten, reloading at %08x: %s", entry->addr, reason);
 	if (doDelete) {
-		if (initialMatch && standardScaleFactor_ == 1 && (entry->status & TexCacheEntry::STATUS_IS_SCALED) == 0) {
-			// Actually, if size and number of levels match, let's try to avoid deleting and recreating.
-			// Instead, let's use glTexSubImage to replace the images.
-			replaceImages = true;
-		} else {
-			InvalidateLastTexture();
-			ReleaseTexture(entry, true);
-			entry->status &= ~TexCacheEntry::STATUS_IS_SCALED;
-		}
+		InvalidateLastTexture();
+		ReleaseTexture(entry, true);
+		entry->status &= ~TexCacheEntry::STATUS_IS_SCALED;
 	}
 	// Clear the reliable bit if set.
 	if (entry->GetHashStatus() == TexCacheEntry::STATUS_RELIABLE) {
@@ -618,8 +610,6 @@ bool TextureCacheCommon::HandleTextureChange(TexCacheEntry *const entry, const c
 		}
 	}
 	entry->numFrames = 0;
-
-	return replaceImages;
 }
 
 void TextureCacheCommon::NotifyFramebuffer(u32 address, VirtualFramebuffer *framebuffer, FramebufferNotification msg) {
@@ -1488,7 +1478,6 @@ void TextureCacheCommon::ApplyTexture() {
 
 	UpdateMaxSeenV(entry, gstate.isModeThrough());
 
-	bool replaceImages = false;
 	if (nextNeedsRebuild_) {
 		// Regardless of hash fails or otherwise, if this is a video, mark it frequently changing.
 		// This prevents temporary scaling perf hits on the first second of video.
@@ -1509,14 +1498,14 @@ void TextureCacheCommon::ApplyTexture() {
 		}
 		if (nextNeedsChange_) {
 			// This texture existed previously, let's handle the change.
-			replaceImages = HandleTextureChange(entry, nextChangeReason_, false, true);
+			HandleTextureChange(entry, nextChangeReason_, false, true);
 		}
 		// We actually build afterward (shared with rehash rebuild.)
 	} else if (nextNeedsRehash_) {
 		// Okay, this matched and didn't change - but let's check the hash.  Maybe it will change.
 		bool doDelete = true;
 		if (!CheckFullHash(entry, doDelete)) {
-			replaceImages = HandleTextureChange(entry, "hash fail", true, doDelete);
+			HandleTextureChange(entry, "hash fail", true, doDelete);
 			nextNeedsRebuild_ = true;
 		} else if (nextTexture_ != nullptr) {
 			// The secondary cache may choose an entry from its storage by setting nextTexture_.
@@ -1529,7 +1518,8 @@ void TextureCacheCommon::ApplyTexture() {
 
 	// Okay, now actually rebuild the texture if needed.
 	if (nextNeedsRebuild_) {
-		BuildTexture(entry, replaceImages);
+		_assert_(!entry->texturePtr);
+		BuildTexture(entry);
 	}
 
 	entry->lastFrame = gpuStats.numFlips;
diff --git a/GPU/Common/TextureCacheCommon.h b/GPU/Common/TextureCacheCommon.h
index 970f1d8ea9..45b7092c67 100644
--- a/GPU/Common/TextureCacheCommon.h
+++ b/GPU/Common/TextureCacheCommon.h
@@ -225,8 +225,8 @@ protected:
 	void Decimate();
 
 	virtual void ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFramebuffer *framebuffer) = 0;
-	bool HandleTextureChange(TexCacheEntry *const entry, const char *reason, bool initialMatch, bool doDelete);
-	virtual void BuildTexture(TexCacheEntry *const entry, bool replaceImages) = 0;
+	void HandleTextureChange(TexCacheEntry *const entry, const char *reason, bool initialMatch, bool doDelete);
+	virtual void BuildTexture(TexCacheEntry *const entry) = 0;
 	virtual void UpdateCurrentClut(GEPaletteFormat clutFormat, u32 clutBase, bool clutIndexIsSimple) = 0;
 	bool CheckFullHash(TexCacheEntry *entry, bool &doDelete);
 
diff --git a/GPU/D3D11/D3D11Util.cpp b/GPU/D3D11/D3D11Util.cpp
index ac2a904fa9..a3b2e963af 100644
--- a/GPU/D3D11/D3D11Util.cpp
+++ b/GPU/D3D11/D3D11Util.cpp
@@ -1,6 +1,7 @@
 #include "ppsspp_config.h"
 
 #include <cstdint>
+#include <cfloat>
 #include <vector>
 #include <d3d11.h>
 #include <D3Dcompiler.h>
@@ -151,4 +152,4 @@ void StockObjectsD3D11::Destroy() {
 	samplerLinear2DClamp->Release();
 }
 
-StockObjectsD3D11 stockD3D11;
\ No newline at end of file
+StockObjectsD3D11 stockD3D11;
diff --git a/GPU/D3D11/TextureCacheD3D11.cpp b/GPU/D3D11/TextureCacheD3D11.cpp
index a983a765dd..f437329a55 100644
--- a/GPU/D3D11/TextureCacheD3D11.cpp
+++ b/GPU/D3D11/TextureCacheD3D11.cpp
@@ -427,7 +427,7 @@ void TextureCacheD3D11::ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFra
 }
 
 
-void TextureCacheD3D11::BuildTexture(TexCacheEntry *const entry, bool replaceImages) {
+void TextureCacheD3D11::BuildTexture(TexCacheEntry *const entry) {
 	entry->status &= ~TexCacheEntry::STATUS_ALPHA_MASK;
 
 	// For the estimate, we assume cluts always point to 8888 for simplicity.
@@ -487,11 +487,6 @@ void TextureCacheD3D11::BuildTexture(TexCacheEntry *const entry, bool replaceIma
 	int h = gstate.getTextureHeight(0);
 	ReplacedTexture &replaced = replacer_.FindReplacement(cachekey, entry->fullhash, w, h);
 	if (replaced.GetSize(0, w, h)) {
-		if (replaceImages) {
-			// Since we're replacing the texture, we can't replace the image inside.
-			ReleaseTexture(entry, true);
-			replaceImages = false;
-		}
 		// We're replacing, so we won't scale.
 		scaleFactor = 1;
 		entry->status |= TexCacheEntry::STATUS_IS_SCALED;
@@ -521,12 +516,6 @@ void TextureCacheD3D11::BuildTexture(TexCacheEntry *const entry, bool replaceIma
 		}
 	}
 
-	if (replaceImages) {
-		// Make sure it's not currently set.
-		ID3D11ShaderResourceView *srv = nullptr;
-		context_->PSSetShaderResources(0, 1, &srv);
-	}
-
 	// Seems to cause problems in Tactics Ogre.
 	if (badMipSizes) {
 		maxLevel = 0;
@@ -541,10 +530,11 @@ void TextureCacheD3D11::BuildTexture(TexCacheEntry *const entry, bool replaceIma
 	if (IsFakeMipmapChange()) {
 		// NOTE: Since the level is not part of the cache key, we assume it never changes.
 		u8 level = std::max(0, gstate.getTexLevelOffset16() / 16);
-		LoadTextureLevel(*entry, replaced, level, maxLevel, replaceImages, scaleFactor, dstFmt);
+		LoadTextureLevel(*entry, replaced, level, maxLevel, scaleFactor, dstFmt);
 	} else {
-		LoadTextureLevel(*entry, replaced, 0, maxLevel, replaceImages, scaleFactor, dstFmt);
+		LoadTextureLevel(*entry, replaced, 0, maxLevel, scaleFactor, dstFmt);
 	}
+
 	ID3D11ShaderResourceView *textureView = DxView(entry);
 	if (!textureView) {
 		return;
@@ -553,7 +543,7 @@ void TextureCacheD3D11::BuildTexture(TexCacheEntry *const entry, bool replaceIma
 	// Mipmapping is only enabled when texture scaling is disabled.
 	if (maxLevel > 0 && scaleFactor == 1) {
 		for (int i = 1; i <= maxLevel; i++) {
-			LoadTextureLevel(*entry, replaced, i, maxLevel, replaceImages, scaleFactor, dstFmt);
+			LoadTextureLevel(*entry, replaced, i, maxLevel, scaleFactor, dstFmt);
 		}
 	}
 
@@ -647,12 +637,12 @@ DXGI_FORMAT ToDXGIFormat(ReplacedTextureFormat fmt) {
 	}
 }
 
-void TextureCacheD3D11::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int maxLevel, bool replaceImages, int scaleFactor, DXGI_FORMAT dstFmt) {
+void TextureCacheD3D11::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int maxLevel, int scaleFactor, DXGI_FORMAT dstFmt) {
 	int w = gstate.getTextureWidth(level);
 	int h = gstate.getTextureHeight(level);
 
 	ID3D11Texture2D *texture = DxTex(&entry);
-	if ((level == 0 || IsFakeMipmapChange()) && (!replaceImages || texture == nullptr)) {
+	if ((level == 0 || IsFakeMipmapChange()) && texture == nullptr) {
 		// Create texture
 		int levels = scaleFactor == 1 ? maxLevel + 1 : 1;
 		int tw = w, th = h;
diff --git a/GPU/D3D11/TextureCacheD3D11.h b/GPU/D3D11/TextureCacheD3D11.h
index c20ed762a9..8cfa249269 100644
--- a/GPU/D3D11/TextureCacheD3D11.h
+++ b/GPU/D3D11/TextureCacheD3D11.h
@@ -69,19 +69,19 @@ protected:
 	void ReleaseTexture(TexCacheEntry *entry, bool delete_them) override;
 
 private:
-	void LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int maxLevel, bool replaceImages, int scaleFactor, DXGI_FORMAT dstFmt);
+	void LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int maxLevel, int scaleFactor, DXGI_FORMAT dstFmt);
 	DXGI_FORMAT GetDestFormat(GETextureFormat format, GEPaletteFormat clutFormat) const;
 	TexCacheEntry::TexStatus CheckAlpha(const u32 *pixelData, u32 dstFmt, int stride, int w, int h);
 	void UpdateCurrentClut(GEPaletteFormat clutFormat, u32 clutBase, bool clutIndexIsSimple) override;
 
 	void ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFramebuffer *framebuffer) override;
-	void BuildTexture(TexCacheEntry *const entry, bool replaceImages) override;
+	void BuildTexture(TexCacheEntry *const entry) override;
 
 	ID3D11Device *device_;
 	ID3D11DeviceContext *context_;
 
-	ID3D11Texture2D *DxTex(TexCacheEntry *entry) {
-		return (ID3D11Texture2D *)entry->texturePtr;
+	ID3D11Texture2D *&DxTex(TexCacheEntry *entry) {
+		return (ID3D11Texture2D *&)entry->texturePtr;
 	}
 	ID3D11ShaderResourceView *DxView(TexCacheEntry *entry) {
 		return (ID3D11ShaderResourceView *)entry->textureView;
diff --git a/GPU/Directx9/TextureCacheDX9.cpp b/GPU/Directx9/TextureCacheDX9.cpp
index 11876f12b4..49952ccf81 100644
--- a/GPU/Directx9/TextureCacheDX9.cpp
+++ b/GPU/Directx9/TextureCacheDX9.cpp
@@ -469,7 +469,7 @@ void TextureCacheDX9::ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFrame
 	InvalidateLastTexture();
 }
 
-void TextureCacheDX9::BuildTexture(TexCacheEntry *const entry, bool replaceImages) {
+void TextureCacheDX9::BuildTexture(TexCacheEntry *const entry) {
 	entry->status &= ~TexCacheEntry::STATUS_ALPHA_MASK;
 
 	// For the estimate, we assume cluts always point to 8888 for simplicity.
@@ -537,11 +537,6 @@ void TextureCacheDX9::BuildTexture(TexCacheEntry *const entry, bool replaceImage
 	int h = gstate.getTextureHeight(0);
 	ReplacedTexture &replaced = replacer_.FindReplacement(cachekey, entry->fullhash, w, h);
 	if (replaced.GetSize(0, w, h)) {
-		if (replaceImages) {
-			// Since we're replacing the texture, we can't replace the image inside.
-			ReleaseTexture(entry, true);
-			replaceImages = false;
-		}
 		// We're replacing, so we won't scale.
 		scaleFactor = 1;
 		entry->status |= TexCacheEntry::STATUS_IS_SCALED;
@@ -571,10 +566,6 @@ void TextureCacheDX9::BuildTexture(TexCacheEntry *const entry, bool replaceImage
 		}
 	}
 
-	if (replaceImages) {
-		// Make sure it's not currently set.
-		device_->SetTexture(0, NULL);
-	}
 	// Seems to cause problems in Tactics Ogre.
 	if (badMipSizes) {
 		maxLevel = 0;
@@ -583,9 +574,9 @@ void TextureCacheDX9::BuildTexture(TexCacheEntry *const entry, bool replaceImage
 	if (IsFakeMipmapChange()) {
 		// NOTE: Since the level is not part of the cache key, we assume it never changes.
 		u8 level = std::max(0, gstate.getTexLevelOffset16() / 16);
-		LoadTextureLevel(*entry, replaced, level, maxLevel, replaceImages, scaleFactor, dstFmt);
+		LoadTextureLevel(*entry, replaced, level, maxLevel, scaleFactor, dstFmt);
 	} else {
-		LoadTextureLevel(*entry, replaced, 0, maxLevel, replaceImages, scaleFactor, dstFmt);
+		LoadTextureLevel(*entry, replaced, 0, maxLevel, scaleFactor, dstFmt);
 	}
 	LPDIRECT3DTEXTURE9 &texture = DxTex(entry);
 	if (!texture) {
@@ -595,7 +586,7 @@ void TextureCacheDX9::BuildTexture(TexCacheEntry *const entry, bool replaceImage
 	// Mipmapping is only enabled when texture scaling is disabled.
 	if (maxLevel > 0 && scaleFactor == 1) {
 		for (int i = 1; i <= maxLevel; i++) {
-			LoadTextureLevel(*entry, replaced, i, maxLevel, replaceImages, scaleFactor, dstFmt);
+			LoadTextureLevel(*entry, replaced, i, maxLevel, scaleFactor, dstFmt);
 		}
 	}
 
@@ -670,12 +661,12 @@ D3DFORMAT ToD3D9Format(ReplacedTextureFormat fmt) {
 	}
 }
 
-void TextureCacheDX9::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int maxLevel, bool replaceImages, int scaleFactor, u32 dstFmt) {
+void TextureCacheDX9::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int maxLevel, int scaleFactor, u32 dstFmt) {
 	int w = gstate.getTextureWidth(level);
 	int h = gstate.getTextureHeight(level);
 
 	LPDIRECT3DTEXTURE9 &texture = DxTex(&entry);
-	if ((level == 0 || IsFakeMipmapChange()) && (!replaceImages || texture == nullptr)) {
+	if ((level == 0 || IsFakeMipmapChange()) && texture == nullptr) {
 		// Create texture
 		D3DPOOL pool = D3DPOOL_MANAGED;
 		int usage = 0;
diff --git a/GPU/Directx9/TextureCacheDX9.h b/GPU/Directx9/TextureCacheDX9.h
index a4c19572f4..4d9b308793 100644
--- a/GPU/Directx9/TextureCacheDX9.h
+++ b/GPU/Directx9/TextureCacheDX9.h
@@ -63,13 +63,13 @@ protected:
 
 private:
 	void UpdateSamplingParams(TexCacheEntry &entry, bool force);
-	void LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int maxLevel, bool replaceImages, int scaleFactor, u32 dstFmt);
+	void LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int maxLevel, int scaleFactor, u32 dstFmt);
 	D3DFORMAT GetDestFormat(GETextureFormat format, GEPaletteFormat clutFormat) const;
 	TexCacheEntry::TexStatus CheckAlpha(const u32 *pixelData, u32 dstFmt, int stride, int w, int h);
 	void UpdateCurrentClut(GEPaletteFormat clutFormat, u32 clutBase, bool clutIndexIsSimple) override;
 
 	void ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFramebuffer *framebuffer) override;
-	void BuildTexture(TexCacheEntry *const entry, bool replaceImages) override;
+	void BuildTexture(TexCacheEntry *const entry) override;
 
 	LPDIRECT3DTEXTURE9 &DxTex(TexCacheEntry *entry) {
 		return *(LPDIRECT3DTEXTURE9 *)&entry->texturePtr;
diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp
index c265c12d4d..22d8ea4db3 100644
--- a/GPU/GLES/TextureCacheGLES.cpp
+++ b/GPU/GLES/TextureCacheGLES.cpp
@@ -496,13 +496,9 @@ GLenum ToGLESFormat(ReplacedTextureFormat fmt) {
 	}
 }
 
-void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry, bool replaceImages) {
+void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry) {
 	entry->status &= ~TexCacheEntry::STATUS_ALPHA_MASK;
 
-	// Never replace images in-place - there's no such thing, drivers have to fake it anyway, at least if
-	// the image has been in use within the last frame or two.
-	replaceImages = false;
-
 	// For the estimate, we assume cluts always point to 8888 for simplicity.
 	cacheSizeEstimate_ += EstimateTexMemoryUsage(entry);
 
@@ -512,10 +508,8 @@ void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry, bool replaceImag
 	}
 
 	// Always generate a texture name unless it's a framebuffer, we might need it if the texture is replaced later.
-	if (!replaceImages) {
-		if (!entry->textureName) {
-			entry->textureName = render_->CreateTexture(GL_TEXTURE_2D);
-		}
+	if (!entry->textureName) {
+		entry->textureName = render_->CreateTexture(GL_TEXTURE_2D);
 	}
 
 	if ((entry->bufw == 0 || (gstate.texbufwidth[0] & 0xf800) != 0) && entry->addr >= PSP_GetKernelMemoryEnd()) {
@@ -581,13 +575,6 @@ void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry, bool replaceImag
 	int h = gstate.getTextureHeight(0);
 	ReplacedTexture &replaced = replacer_.FindReplacement(cachekey, entry->fullhash, w, h);
 	if (replaced.GetSize(0, w, h)) {
-		if (replaceImages) {
-			// Since we're replacing the texture, we can't replace the image inside.
-			render_->DeleteTexture(entry->textureName);
-			entry->textureName = render_->CreateTexture(GL_TEXTURE_2D);
-			replaceImages = false;
-		}
-
 		// We're replacing, so we won't scale.
 		scaleFactor = 1;
 		entry->status |= TexCacheEntry::STATUS_IS_SCALED;
@@ -630,9 +617,9 @@ void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry, bool replaceImag
 	if (IsFakeMipmapChange()) {
 		// NOTE: Since the level is not part of the cache key, we assume it never changes.
 		u8 level = std::max(0, gstate.getTexLevelOffset16() / 16);
-		LoadTextureLevel(*entry, replaced, level, replaceImages, scaleFactor, dstFmt);
+		LoadTextureLevel(*entry, replaced, level, scaleFactor, dstFmt);
 	} else
-		LoadTextureLevel(*entry, replaced, 0, replaceImages, scaleFactor, dstFmt);
+		LoadTextureLevel(*entry, replaced, 0, scaleFactor, dstFmt);
 
 	// Mipmapping only enable when texture scaling disable
 	int texMaxLevel = 0;
@@ -649,7 +636,7 @@ void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry, bool replaceImag
 				}
 			} else {
 				for (int i = 1; i <= maxLevel; i++) {
-					LoadTextureLevel(*entry, replaced, i, replaceImages, scaleFactor, dstFmt);
+					LoadTextureLevel(*entry, replaced, i, scaleFactor, dstFmt);
 				}
 				texMaxLevel = maxLevel;
 			}
@@ -726,7 +713,7 @@ TexCacheEntry::TexStatus TextureCacheGLES::CheckAlpha(const uint8_t *pixelData,
 	return (TexCacheEntry::TexStatus)res;
 }
 
-void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, bool replaceImages, int scaleFactor, GLenum dstFmt) {
+void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int scaleFactor, GLenum dstFmt) {
 	int w = gstate.getTextureWidth(level);
 	int h = gstate.getTextureHeight(level);
 	bool useUnpack = false;
@@ -798,17 +785,11 @@ void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &r
 
 	GLuint components2 = components;
 
-	if (replaceImages) {
-		PROFILE_THIS_SCOPE("repltex");
-		Crash();
-		// glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, w, h, components2, dstFmt, pixelData);
-	} else {
-		PROFILE_THIS_SCOPE("loadtex");
-		if (IsFakeMipmapChange())
-			render_->TextureImage(entry.textureName, 0, w, h, components, components2, dstFmt, pixelData, GLRAllocType::ALIGNED);
-		else
-			render_->TextureImage(entry.textureName, level, w, h, components, components2, dstFmt, pixelData, GLRAllocType::ALIGNED);
-	}
+	PROFILE_THIS_SCOPE("loadtex");
+	if (IsFakeMipmapChange())
+		render_->TextureImage(entry.textureName, 0, w, h, components, components2, dstFmt, pixelData, GLRAllocType::ALIGNED);
+	else
+		render_->TextureImage(entry.textureName, level, w, h, components, components2, dstFmt, pixelData, GLRAllocType::ALIGNED);
 }
 
 bool TextureCacheGLES::GetCurrentTextureDebug(GPUDebugBuffer &buffer, int level) {
diff --git a/GPU/GLES/TextureCacheGLES.h b/GPU/GLES/TextureCacheGLES.h
index 82756af4f6..36f7e600e0 100644
--- a/GPU/GLES/TextureCacheGLES.h
+++ b/GPU/GLES/TextureCacheGLES.h
@@ -75,14 +75,14 @@ protected:
 
 private:
 	void UpdateSamplingParams(TexCacheEntry &entry, bool force);
-	void LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, bool replaceImages, int scaleFactor, GLenum dstFmt);
+	void LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int scaleFactor, GLenum dstFmt);
 	GLenum GetDestFormat(GETextureFormat format, GEPaletteFormat clutFormat) const;
 
 	TexCacheEntry::TexStatus CheckAlpha(const uint8_t *pixelData, GLenum dstFmt, int stride, int w, int h);
 	void UpdateCurrentClut(GEPaletteFormat clutFormat, u32 clutBase, bool clutIndexIsSimple) override;
 	void ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFramebuffer *framebuffer) override;
 
-	void BuildTexture(TexCacheEntry *const entry, bool replaceImages) override;
+	void BuildTexture(TexCacheEntry *const entry) override;
 
 	GLRenderManager *render_;
 
diff --git a/GPU/GPU.cpp b/GPU/GPU.cpp
index abccdf6da9..7322d52a3a 100644
--- a/GPU/GPU.cpp
+++ b/GPU/GPU.cpp
@@ -77,14 +77,14 @@ bool GPU_Init(GraphicsContext *ctx, Draw::DrawContext *draw) {
 		SetGPU(new SoftGPU(ctx, draw));
 		break;
 	case GPUCORE_DIRECTX9:
-#if defined(_WIN32) && !defined(__LIBRETRO__)
+#if defined(_WIN32)
 		SetGPU(new DIRECTX9_GPU(ctx, draw));
 		break;
 #else
 		return false;
 #endif
 	case GPUCORE_DIRECTX11:
-#if defined(_WIN32) && !defined(__LIBRETRO__)
+#if defined(_WIN32)
 		SetGPU(new GPU_D3D11(ctx, draw));
 		break;
 #else
diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
index 1762edffbb..e9ac80f102 100644
--- a/GPU/GPUCommon.cpp
+++ b/GPU/GPUCommon.cpp
@@ -86,10 +86,10 @@ const CommonCommandTableEntry commonCommandTable[] = {
 	{ GE_CMD_LIGHTENABLE1, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE  },
 	{ GE_CMD_LIGHTENABLE2, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE  },
 	{ GE_CMD_LIGHTENABLE3, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE  },
-	{ GE_CMD_LIGHTTYPE0, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE  },
-	{ GE_CMD_LIGHTTYPE1, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE  },
-	{ GE_CMD_LIGHTTYPE2, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE  },
-	{ GE_CMD_LIGHTTYPE3, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE  },
+	{ GE_CMD_LIGHTTYPE0, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE | DIRTY_LIGHT0 },
+	{ GE_CMD_LIGHTTYPE1, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE | DIRTY_LIGHT1 },
+	{ GE_CMD_LIGHTTYPE2, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE | DIRTY_LIGHT2 },
+	{ GE_CMD_LIGHTTYPE3, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE | DIRTY_LIGHT3 },
 	{ GE_CMD_MATERIALUPDATE, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE | DIRTY_FRAGMENTSHADER_STATE },
 
 	// These change both shaders so need flushing.
@@ -1472,6 +1472,9 @@ void GPUCommon::Execute_Prim(u32 op, u32 diff) {
 	if (gstate_c.skipDrawReason & (SKIPDRAW_SKIPFRAME | SKIPDRAW_NON_DISPLAYED_FB)) {
 		// Rough estimate, not sure what's correct.
 		cyclesExecuted += EstimatePerVertexCost() * count;
+		if (gstate.isModeClear()) {
+			gpuStats.numClears++;
+		}
 		return;
 	}
 
diff --git a/GPU/GPUCommon.h b/GPU/GPUCommon.h
index 632399d1b8..2be8ba365a 100644
--- a/GPU/GPUCommon.h
+++ b/GPU/GPUCommon.h
@@ -333,8 +333,8 @@ protected:
 	bool debugRecording_;
 	bool interruptsEnabled_;
 	bool resized_;
-	DrawType lastDraw_;
-	GEPrimitiveType lastPrim_;
+	DrawType lastDraw_ = DRAW_UNKNOWN;
+	GEPrimitiveType lastPrim_ = GE_PRIM_INVALID;
 
 	int vertexCost_ = 0;
 
diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp
index 0af59d8956..782487904a 100644
--- a/GPU/Vulkan/TextureCacheVulkan.cpp
+++ b/GPU/Vulkan/TextureCacheVulkan.cpp
@@ -182,7 +182,9 @@ void TextureCacheVulkan::DeviceLost() {
 	}
 
 	samplerCache_.DeviceLost();
-	vulkan_->Delete().QueueDeleteSampler(samplerNearest_);
+
+	if (samplerNearest_)
+		vulkan_->Delete().QueueDeleteSampler(samplerNearest_);
 
 	nextTexture_ = nullptr;
 }
@@ -457,7 +459,7 @@ VkFormat ToVulkanFormat(ReplacedTextureFormat fmt) {
 	}
 }
 
-void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry, bool replaceImages) {
+void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry) {
 	entry->status &= ~TexCacheEntry::STATUS_ALPHA_MASK;
 
 	VkCommandBuffer cmdInit = (VkCommandBuffer)draw_->GetNativeObject(Draw::NativeObject::INIT_COMMANDBUFFER);
@@ -526,11 +528,6 @@ void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry, bool replaceIm
 	int h = gstate.getTextureHeight(0);
 	ReplacedTexture &replaced = replacer_.FindReplacement(cachekey, entry->fullhash, w, h);
 	if (replaced.GetSize(0, w, h)) {
-		if (replaceImages) {
-			// Since we're replacing the texture, we can't replace the image inside.
-			ReleaseTexture(entry, true);
-			replaceImages = false;
-		}
 		// We're replacing, so we won't scale.
 		scaleFactor = 1;
 		entry->status |= TexCacheEntry::STATUS_IS_SCALED;
diff --git a/GPU/Vulkan/TextureCacheVulkan.h b/GPU/Vulkan/TextureCacheVulkan.h
index ddf3ec9362..3e44d69f7e 100644
--- a/GPU/Vulkan/TextureCacheVulkan.h
+++ b/GPU/Vulkan/TextureCacheVulkan.h
@@ -129,7 +129,7 @@ private:
 	void UpdateCurrentClut(GEPaletteFormat clutFormat, u32 clutBase, bool clutIndexIsSimple) override;
 
 	void ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFramebuffer *framebuffer) override;
-	void BuildTexture(TexCacheEntry *const entry, bool replaceImages) override;
+	void BuildTexture(TexCacheEntry *const entry) override;
 
 	VulkanContext *vulkan_ = nullptr;
 	VulkanDeviceAllocator *allocator_ = nullptr;
diff --git a/SDL/SDLJoystick.h b/SDL/SDLJoystick.h
index c5d8113efc..970b105199 100644
--- a/SDL/SDLJoystick.h
+++ b/SDL/SDLJoystick.h
@@ -1,5 +1,5 @@
 #pragma once
-#ifdef _WIN32
+#ifdef _MSC_VER
 #include "SDL/SDL.h"
 #include "SDL/SDL_thread.h"
 #else
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index 9cd5af04a9..5e814d05dc 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -218,7 +218,8 @@ int getDisplayNumber(void) {
 
 void SystemToast(const char *text) {
 #ifdef _WIN32
-	MessageBox(0, text, "Toast!", MB_ICONINFORMATION);
+	std::wstring str = ConvertUTF8ToWString(text);
+	MessageBox(0, str.c_str(), L"Toast!", MB_ICONINFORMATION);
 #else
 	puts(text);
 #endif
@@ -256,7 +257,8 @@ void LaunchBrowser(const char *url) {
 #if defined(MOBILE_DEVICE)
 	ILOG("Would have gone to %s but LaunchBrowser is not implemented on this platform", url);
 #elif defined(_WIN32)
-	ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
+	std::wstring wurl = ConvertUTF8ToWString(url);
+	ShellExecute(NULL, L"open", wurl.c_str(), NULL, NULL, SW_SHOWNORMAL);
 #elif defined(__APPLE__)
 	std::string command = std::string("open ") + url;
 	system(command.c_str());
@@ -273,7 +275,8 @@ void LaunchMarket(const char *url) {
 #if defined(MOBILE_DEVICE)
 	ILOG("Would have gone to %s but LaunchMarket is not implemented on this platform", url);
 #elif defined(_WIN32)
-	ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
+	std::wstring wurl = ConvertUTF8ToWString(url);
+	ShellExecute(NULL, L"open", wurl.c_str(), NULL, NULL, SW_SHOWNORMAL);
 #elif defined(__APPLE__)
 	std::string command = std::string("open ") + url;
 	system(command.c_str());
@@ -290,7 +293,8 @@ void LaunchEmail(const char *email_address) {
 #if defined(MOBILE_DEVICE)
 	ILOG("Would have opened your email client for %s but LaunchEmail is not implemented on this platform", email_address);
 #elif defined(_WIN32)
-	ShellExecute(NULL, "open", (std::string("mailto:") + email_address).c_str(), NULL, NULL, SW_SHOWNORMAL);
+	std::wstring mailto = std::wstring(L"mailto:") + ConvertUTF8ToWString(email_address);
+	ShellExecute(NULL, L"open", mailto.c_str(), NULL, NULL, SW_SHOWNORMAL);
 #elif defined(__APPLE__)
 	std::string command = std::string("open mailto:") + email_address;
 	system(command.c_str());
@@ -698,6 +702,7 @@ int main(int argc, char *argv[]) {
 	graphicsContext->ThreadStart();
 
 	while (true) {
+		double startTime = time_now_d();
 		SDL_Event event;
 		while (SDL_PollEvent(&event)) {
 			float mx = event.motion.x * g_dpi_scale_x;
@@ -887,9 +892,21 @@ int main(int argc, char *argv[]) {
 			if (!graphicsContext->ThreadFrame())
 				break;
 		}
+
+
 		graphicsContext->SwapBuffers();
 
 		ToggleFullScreenIfFlagSet(window);
+
+		// Simple throttling to not burn the GPU in the menu.
+		time_update();
+		if (GetUIState() != UISTATE_INGAME || !PSP_IsInited()) {
+			double diffTime = time_now_d() - startTime;
+			int sleepTime = (int)(1000.0 / 60.0) - (int)(diffTime * 1000.0);
+			if (sleepTime > 0)
+				sleep_ms(sleepTime);
+		}
+
 		time_update();
 		framecount++;
 	}
@@ -908,11 +925,12 @@ int main(int argc, char *argv[]) {
 	if (!useEmuThread) {
 		NativeShutdownGraphics();
 	}
-	graphicsContext->Shutdown();
 	graphicsContext->ThreadEnd();
-	graphicsContext->ShutdownFromRenderThread();
 
 	NativeShutdown();
+
+	// Destroys Draw, which is used in NativeShutdown to shutdown.
+	graphicsContext->ShutdownFromRenderThread();
 	delete graphicsContext;
 
 	SDL_PauseAudio(1);
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 1b2479c4a5..7a73fb756d 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -52,6 +52,7 @@
 #include "Core/Host.h"
 #include "Core/System.h"
 #include "Core/Reporting.h"
+#include "GPU/Common/PostShader.h"
 #include "android/jni/TestRunner.h"
 #include "GPU/GPUInterface.h"
 #include "GPU/Common/FramebufferCommon.h"
@@ -106,6 +107,14 @@ bool DoesBackendSupportHWTess() {
 	return false;
 }
 
+static std::string PostShaderTranslateName(const char *value) {
+	I18NCategory *ps = GetI18NCategory("PostShaders");
+	const ShaderInfo *info = GetPostShaderInfo(value);
+	if (info) {
+		return ps->T(value, info ? info->name.c_str() : value);
+	}
+}
+
 void GameSettingsScreen::CreateViews() {
 	if (editThenRestore_) {
 		g_Config.loadGameConfig(gameID_);
@@ -246,7 +255,7 @@ void GameSettingsScreen::CreateViews() {
 	// Hide postprocess option on unsupported backends to avoid confusion.
 	if (GetGPUBackend() != GPUBackend::DIRECT3D9) {
 		I18NCategory *ps = GetI18NCategory("PostShaders");
-		postProcChoice_ = graphicsSettings->Add(new ChoiceWithValueDisplay(&g_Config.sPostShaderName, gr->T("Postprocessing Shader"), ps->GetName()));
+		postProcChoice_ = graphicsSettings->Add(new ChoiceWithValueDisplay(&g_Config.sPostShaderName, gr->T("Postprocessing Shader"), &PostShaderTranslateName));
 		postProcChoice_->OnClick.Handle(this, &GameSettingsScreen::OnPostProcShader);
 		postProcEnable_ = !g_Config.bSoftwareRendering && (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE);
 		postProcChoice_->SetEnabledPtr(&postProcEnable_);
@@ -613,12 +622,12 @@ void GameSettingsScreen::CreateViews() {
 #if !defined(MOBILE_DEVICE) && !defined(USING_QT_UI)
 	networkingSettings->Add(new PopupTextInputChoice(&g_Config.proAdhocServer, n->T("Change proAdhocServer Address"), "", 255, screenManager()));
 #elif defined(__ANDROID__)
-	networkingSettings->Add(new ChoiceWithValueDisplay(&g_Config.proAdhocServer, n->T("Change proAdhocServer Address"), nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeproAdhocServerAddress);
+	networkingSettings->Add(new ChoiceWithValueDisplay(&g_Config.proAdhocServer, n->T("Change proAdhocServer Address"), (const char *)nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeproAdhocServerAddress);
 #else
-	networkingSettings->Add(new ChoiceWithValueDisplay(&g_Config.proAdhocServer, n->T("Change proAdhocServer Address"), nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeproAdhocServerAddress);
+	networkingSettings->Add(new ChoiceWithValueDisplay(&g_Config.proAdhocServer, n->T("Change proAdhocServer Address"), (const char *)nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeproAdhocServerAddress);
 #endif
 	networkingSettings->Add(new CheckBox(&g_Config.bEnableAdhocServer, n->T("Enable built-in PRO Adhoc Server", "Enable built-in PRO Adhoc Server")));
-	networkingSettings->Add(new ChoiceWithValueDisplay(&g_Config.sMACAddress, n->T("Change Mac Address"), nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress);
+	networkingSettings->Add(new ChoiceWithValueDisplay(&g_Config.sMACAddress, n->T("Change Mac Address"), (const char *)nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress);
 	networkingSettings->Add(new PopupSliderChoice(&g_Config.iPortOffset, 0, 60000, n->T("Port offset", "Port offset(0 = PSP compatibility)"), 100, screenManager()));
 	networkingSettings->Add(new CheckBox(&g_Config.bMOHH2hack, n->T("Medal of Honor Heroes 2 hack", "Medal of Honor Heroes 2 hack")));
 
@@ -708,6 +717,7 @@ void GameSettingsScreen::CreateViews() {
 	}
 	systemSettings->Add(new Choice(sy->T("Restore Default Settings")))->OnClick.Handle(this, &GameSettingsScreen::OnRestoreDefaultSettings);
 	if (!g_Config.bSimpleUI) {
+		systemSettings->Add(new CheckBox(&g_Config.bEnableStateUndo, sy->T("Savestate slot backups")));
 		systemSettings->Add(new CheckBox(&g_Config.bEnableAutoLoad, sy->T("Auto Load Newest Savestate")));
 
 #if defined(USING_WIN_UI)
@@ -735,13 +745,20 @@ void GameSettingsScreen::CreateViews() {
 			}
 			else
 				SavePathInMyDocumentChoice->SetEnabled(false);
-		}
-		else {
-			if (installed_ && (result == S_OK)) {
-				std::ifstream inputFile(ConvertUTF8ToWString(installedFile));
-				if (!inputFile.fail() && inputFile.is_open()) {
-					std::string tempString;
-					std::getline(inputFile, tempString);
+			else
+				SavePathInOtherChoice->SetEnabled(true);
+		} else
+			SavePathInMyDocumentChoice->SetEnabled(false);
+	} else {
+		if (installed_ && (result == S_OK)) {
+#ifdef _MSC_VER
+			std::ifstream inputFile(ConvertUTF8ToWString(installedFile));
+#else
+			std::ifstream inputFile(installedFile);
+#endif
+			if (!inputFile.fail() && inputFile.is_open()) {
+				std::string tempString;
+				std::getline(inputFile, tempString);
 
 					// Skip UTF-8 encoding bytes if there are any. There are 3 of them.
 					if (tempString.substr(0, 3) == "\xEF\xBB\xBF")
@@ -781,7 +798,7 @@ void GameSettingsScreen::CreateViews() {
 #elif defined(USING_QT_UI)
 	systemSettings->Add(new Choice(sy->T("Change Nickname")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeNickname);
 #elif defined(__ANDROID__)
-	systemSettings->Add(new ChoiceWithValueDisplay(&g_Config.sNickName, sy->T("Change Nickname"), nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeNickname);
+	systemSettings->Add(new ChoiceWithValueDisplay(&g_Config.sNickName, sy->T("Change Nickname"), (const char *)nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeNickname);
 #endif
 #if defined(_WIN32) || (defined(USING_QT_UI) && !defined(MOBILE_DEVICE))
 	if (!g_Config.bSimpleUI) {
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
index 7dad059b0b..4dc296d49d 100644
--- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp
@@ -311,7 +311,7 @@ PostProcScreen::PostProcScreen(const std::string &title) : ListPopupScreen(title
 	for (int i = 0; i < (int)shaders_.size(); i++) {
 		if (shaders_[i].section == g_Config.sPostShaderName)
 			selected = i;
-		items.push_back(ps->T(shaders_[i].section.c_str()));
+		items.push_back(ps->T(shaders_[i].section.c_str(), shaders_[i].name.c_str()));
 	}
 	adaptor_ = UI::StringVectorListAdaptor(items, selected);
 }
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 17a64dc2a9..0c914628d6 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -138,6 +138,8 @@ static bool isOuya;
 static bool resized = false;
 static bool restarting = false;
 
+static bool askedForStoragePermission = false;
+
 struct PendingMessage {
 	std::string msg;
 	std::string value;
@@ -369,6 +371,9 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 	g_Config.AddSearchPath(user_data_path);
 	g_Config.AddSearchPath(g_Config.memStickDirectory + "PSP/SYSTEM/");
 	g_Config.SetDefaultPath(g_Config.memStickDirectory + "PSP/SYSTEM/");
+
+	// Note that if we don't have storage permission here, loading the config will
+	// fail and it will be set to the default. Later, we load again when we get permission.
 	g_Config.Load();
 	g_Config.externalDirectory = external_dir;
 #endif
@@ -384,6 +389,8 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 	File::CreateDir((g_Config.memStickDirectory + "PSP/GAME").c_str());
 #endif
 
+
+
 	const char *fileToLog = 0;
 	const char *stateToLoad = 0;
 
@@ -510,6 +517,13 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 	else
 		i18nrepo.LoadIni(g_Config.sLanguageIni, langOverridePath);
 
+	if (System_GetPropertyBool(SYSPROP_SUPPORTS_PERMISSIONS)) {
+		if (System_GetPermissionStatus(SYSTEM_PERMISSION_STORAGE) != PERMISSION_STATUS_GRANTED) {
+			System_AskForPermission(SYSTEM_PERMISSION_STORAGE);
+		}
+	}
+
+
 	I18NCategory *des = GetI18NCategory("DesktopUI");
 	// Note to translators: do not translate this/add this to PPSSPP-lang's files.
 	// It's intended to be custom for every user.
@@ -925,6 +939,12 @@ void HandleGlobalMessage(const std::string &msg, const std::string &value) {
 
 		Core_SetPowerSaving(value != "false");
 	}
+	if (msg == "permission_granted" && value == "storage") {
+		// We must have failed to load the config before, so load it now to avoid overwriting the old config
+		// with a freshly generated one.
+		ILOG("Reloading config after storage permission grant.");
+		g_Config.Load();
+	}
 }
 
 void NativeUpdate() {
@@ -1130,10 +1150,6 @@ void NativeShutdown() {
 	// I think we handle most globals correctly or correct-enough now.
 }
 
-void NativePermissionStatus(SystemPermission permission, PermissionStatus status) {
-	// TODO: Send this through the screen system? Nicer than listening to string messages
-}
-
 void PushNewGpsData(float latitude, float longitude, float altitude, float speed, float bearing, long long time) {
 	GPS::setGpsData(latitude, longitude, altitude, speed, bearing, time);
 }
diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp
index 0ae4fec31c..2767e72761 100644
--- a/UI/RemoteISOScreen.cpp
+++ b/UI/RemoteISOScreen.cpp
@@ -689,7 +689,7 @@ void RemoteISOSettingsScreen::CreateViews() {
 #if !defined(MOBILE_DEVICE)
 	PopupTextInputChoice *remoteServer = remoteisoSettings->Add(new PopupTextInputChoice(&g_Config.sLastRemoteISOServer, ri->T("Remote Server"), "", 255, screenManager()));
 #else
-	ChoiceWithValueDisplay *remoteServer = new ChoiceWithValueDisplay(&g_Config.sLastRemoteISOServer, ri->T("Remote Server"), nullptr);
+	ChoiceWithValueDisplay *remoteServer = new ChoiceWithValueDisplay(&g_Config.sLastRemoteISOServer, ri->T("Remote Server"), (const char *)nullptr);
 	remoteisoSettings->Add(remoteServer);
 	remoteServer->OnClick.Handle(this, &RemoteISOSettingsScreen::OnClickRemoteServer);
 #endif
@@ -701,7 +701,7 @@ void RemoteISOSettingsScreen::CreateViews() {
 	remoteSubdir->OnChange.Handle(this, &RemoteISOSettingsScreen::OnChangeRemoteISOSubdir);
 #else
 	ChoiceWithValueDisplay *remoteSubdir = remoteisoSettings->Add(
-			new ChoiceWithValueDisplay(&g_Config.sRemoteISOSubdir, ri->T("Remote Subdirectory"), nullptr));
+			new ChoiceWithValueDisplay(&g_Config.sRemoteISOSubdir, ri->T("Remote Subdirectory"), (const char *)nullptr));
 	remoteSubdir->OnClick.Handle(this, &RemoteISOSettingsScreen::OnClickRemoteISOSubdir);
 #endif
 	remoteSubdir->SetEnabledPtr(&g_Config.bRemoteISOManual);
diff --git a/Windows/DSoundStream.cpp b/Windows/DSoundStream.cpp
index d7bb534fc9..79d8d2699e 100644
--- a/Windows/DSoundStream.cpp
+++ b/Windows/DSoundStream.cpp
@@ -1,8 +1,15 @@
 #include "Common/CommonWindows.h"
 #include <mmreg.h>
-#include <dsound.h>
 #include <process.h>
 
+#ifdef __MINGW32__
+#define __null
+#endif
+#include <dsound.h>
+#ifdef __MINGW32__
+#undef __null
+#endif
+
 #include "thread/threadutil.h"
 #include "Common/OSVersion.h"
 #include "Core/Reporting.h"
@@ -317,8 +324,16 @@ int WASAPIAudioBackend::RunThread() {
 	REFERENCE_TIME hnsBufferDuration, hnsActualDuration;
 	UINT32 pNumBufferFrames;
 	UINT32 pNumPaddingFrames, pNumAvFrames;
+	short *shortBuf = nullptr;
+	int numSamples;
 	hnsBufferDuration = REFTIMES_PER_SEC;
 
+	enum {
+		UNKNOWN_FORMAT = 0,
+		IEEE_FLOAT = 1,
+		PCM16 = 2,
+	} format = UNKNOWN_FORMAT;
+
 	HRESULT hresult;
 	hresult = CoCreateInstance(CLSID_MMDeviceEnumerator,
 		NULL, /*Object is not created as the part of the aggregate */
@@ -357,12 +372,6 @@ int WASAPIAudioBackend::RunThread() {
 
 	sampleRate_ = pDeviceFormat->Format.nSamplesPerSec;
 
-	enum {
-		UNKNOWN_FORMAT = 0,
-		IEEE_FLOAT = 1,
-		PCM16 = 2,
-	} format = UNKNOWN_FORMAT;
-
 	// Don't know if PCM16 ever shows up here, the documentation only talks about float... but let's blindly
 	// try to support it :P
 
@@ -383,11 +392,10 @@ int WASAPIAudioBackend::RunThread() {
 		}
 	}
 
-	short *shortBuf = nullptr;
 
 	BYTE *pData;
 	hresult = pAudioRenderClient->GetBuffer(pNumBufferFrames, &pData);
-	int numSamples = pNumBufferFrames * pDeviceFormat->Format.nChannels;
+	numSamples = pNumBufferFrames * pDeviceFormat->Format.nChannels;
 	if (format == IEEE_FLOAT) {
 		memset(pData, 0, sizeof(float) * numSamples);
 		shortBuf = new short[pNumBufferFrames * pDeviceFormat->Format.nChannels];
diff --git a/Windows/Debugger/Debugger_Misc.cpp b/Windows/Debugger/Debugger_Misc.cpp
index 5cd6e47f06..60655866ed 100644
--- a/Windows/Debugger/Debugger_Misc.cpp
+++ b/Windows/Debugger/Debugger_Misc.cpp
@@ -3,7 +3,6 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
-#include "../../Globals.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 // I M P L E M E N T A T I O N //////////////////////////////////////////////////////////////////////
diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp
index 8d0f2cd953..7a67e976a0 100644
--- a/Windows/DinputDevice.cpp
+++ b/Windows/DinputDevice.cpp
@@ -15,8 +15,10 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include "stdafx.h"
 #include <limits.h>
 #include <algorithm>
+#include <mmsystem.h>
 
 #include "Core/HLE/sceCtrl.h"
 #include "DinputDevice.h"
diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index 03a8124725..34cf5846e8 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -45,7 +45,6 @@ extern std::vector<std::wstring> GetWideCmdLine();
 class GraphicsContext;
 static GraphicsContext *g_graphicsContext;
 
-void EmuThreadFunc(GraphicsContext *graphicsContext);
 void MainThreadFunc();
 
 // On most other platforms, we let the "main" thread become the render thread and
@@ -185,10 +184,15 @@ void MainThreadFunc() {
 			g_Config.Save();
 
 			W32Util::ExitAndRestart();
+		} else {
+			if (g_Config.iGPUBackend == (int)GPUBackend::DIRECT3D9) {
+				// Allow the user to download the DX9 runtime.
+				LaunchBrowser("https://www.microsoft.com/en-us/download/details.aspx?id=34429");
+			}
 		}
 
 		// No safe way out without graphics.
-		exit(1);
+		ExitProcess(1);
 	}
 
 	GraphicsContext *graphicsContext = g_graphicsContext;
diff --git a/Windows/GPU/D3D11Context.cpp b/Windows/GPU/D3D11Context.cpp
index e42ddd2eed..28b1540af3 100644
--- a/Windows/GPU/D3D11Context.cpp
+++ b/Windows/GPU/D3D11Context.cpp
@@ -17,6 +17,11 @@
 #include "thin3d/thin3d_create.h"
 #include "thin3d/d3d11_loader.h"
 
+#ifdef __MINGW32__
+#undef __uuidof
+#define __uuidof(type) IID_##type
+#endif
+
 #if PPSSPP_PLATFORM(UWP)
 #error This file should not be compiled for UWP.
 #endif
diff --git a/Windows/InputBox.h b/Windows/InputBox.h
index 19feafab28..e82c785e5d 100644
--- a/Windows/InputBox.h
+++ b/Windows/InputBox.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <string>
 #include "Common/CommonWindows.h"
 
 
diff --git a/Windows/KeyboardDevice.cpp b/Windows/KeyboardDevice.cpp
index cb546e082d..ff7033323f 100644
--- a/Windows/KeyboardDevice.cpp
+++ b/Windows/KeyboardDevice.cpp
@@ -5,7 +5,7 @@
 #include "KeyMap.h"
 #include "KeyboardDevice.h"
 #include "../Common/CommonTypes.h"
-#include "WinUser.h"
+#include "../Common/CommonWindows.h"
 
 
 // TODO: More keys need to be added, but this is more than
diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index f15bcfe3a5..67a820042e 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -20,7 +20,7 @@
 
 // NOTE: Apologies for the quality of this code, this is really from pre-opensource Dolphin - that is, 2003.
 // It's improving slowly, though. :)
-
+#include "stdafx.h"
 #include "Common/CommonWindows.h"
 #include "Common/KeyMap.h"
 #include "Common/OSVersion.h"
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index 9c8397fcf1..cc3bfb11e4 100644
--- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp
@@ -185,11 +185,16 @@ namespace MainWindow {
 	}
 
 	bool CreateShadersSubmenu(HMENU menu) {
+		// NOTE: We do not load this until translations are loaded!
+		if (!I18NCategoryLoaded("PostShaders"))
+			return false;
+
 		// We only reload this initially and when a menu is actually opened.
 		if (!menuShaderInfoLoaded) {
 			ReloadAllPostShaderInfo();
 			menuShaderInfoLoaded = true;
 		}
+
 		std::vector<ShaderInfo> info = GetAllPostShaderInfo();
 
 		if (menuShaderInfo.size() == info.size() && std::equal(info.begin(), info.end(), menuShaderInfo.begin())) {
@@ -224,7 +229,7 @@ namespace MainWindow {
 					checkedStatus = MF_CHECKED;
 				}
 
-				translatedShaderName = ps->T(i->section.c_str());
+				translatedShaderName = ps->T(i->section.c_str(), i->name.c_str());
 
 				AppendMenu(shaderMenu, MF_STRING | MF_BYPOSITION | checkedStatus, item++, ConvertUTF8ToWString(translatedShaderName).c_str());
 			}
diff --git a/Windows/TouchInputHandler.cpp b/Windows/TouchInputHandler.cpp
index cab9cf085f..b4f4bd38c7 100644
--- a/Windows/TouchInputHandler.cpp
+++ b/Windows/TouchInputHandler.cpp
@@ -1,4 +1,4 @@
-#define NOMINMAX
+#include "stdafx.h"
 #include <Windows.h>
 #include "Windows/TouchInputHandler.h"
 
@@ -7,6 +7,7 @@
 #include "base/display.h"
 #include "Common/CommonWindows.h"
 #include "Common/CommonFuncs.h"
+#include "Common/Log.h"
 #include "base/NativeApp.h"
 #include "Windows/MainWindow.h"
 
diff --git a/Windows/W32Util/Misc.cpp b/Windows/W32Util/Misc.cpp
index f7db70d477..7c2953b2d6 100644
--- a/Windows/W32Util/Misc.cpp
+++ b/Windows/W32Util/Misc.cpp
@@ -56,7 +56,7 @@ namespace W32Util
  
 	void NiceSizeFormat(size_t size, char *out)
 	{
-		char *sizes[] = {"B","KB","MB","GB","TB","PB","EB"};
+		const char *sizes[] = {"B","KB","MB","GB","TB","PB","EB"};
 		int s = 0;
 		int frac = 0;
 		while (size>=1024)
@@ -172,7 +172,7 @@ GenericListControl::GenericListControl(HWND hwnd, const GenericListViewDef& def)
 	int totalListSize = rect.right-rect.left;
 	for (int i = 0; i < columnCount; i++) {
 		lvc.cx = columns[i].size * totalListSize;
-		lvc.pszText = columns[i].name;
+		lvc.pszText = (LPTSTR)columns[i].name;
 
 		if (columns[i].flags & GLVC_CENTERED)
 			lvc.fmt = LVCFMT_CENTER;
@@ -385,4 +385,4 @@ void GenericListControl::SelectAll()
 int GenericListControl::GetSelectedIndex()
 {
 	return ListView_GetNextItem(handle, -1, LVNI_SELECTED);
-}
\ No newline at end of file
+}
diff --git a/Windows/W32Util/Misc.h b/Windows/W32Util/Misc.h
index f73e72b548..457874450e 100644
--- a/Windows/W32Util/Misc.h
+++ b/Windows/W32Util/Misc.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <string>
 #include "Common/CommonWindows.h"
 
 namespace W32Util
@@ -15,7 +16,7 @@ namespace W32Util
 
 struct GenericListViewColumn
 {
-	wchar_t *name;
+	const wchar_t *name;
 	float size;
 	int flags;
 };
@@ -71,4 +72,4 @@ private:
 	// Used for hacky workaround to fix a rare hang (see issue #5184)
 	volatile bool inResizeColumns;
 	volatile bool updating;
-};
\ No newline at end of file
+};
diff --git a/Windows/W32Util/TabControl.cpp b/Windows/W32Util/TabControl.cpp
index b2a9545a66..3da65ff4b9 100644
--- a/Windows/W32Util/TabControl.cpp
+++ b/Windows/W32Util/TabControl.cpp
@@ -15,7 +15,7 @@ TabControl::TabControl(HWND handle, bool noDisplayArea)
 	hasButtons = (GetWindowLong(handle,GWL_STYLE) & TCS_BUTTONS) != 0;
 }
 
-HWND TabControl::AddTabWindow(wchar_t* className, wchar_t* title, DWORD style)
+HWND TabControl::AddTabWindow(const wchar_t* className, const wchar_t *title, DWORD style)
 {
 	TabInfo info;
 	info.hasBorder = (style & WS_BORDER) != 0;
@@ -50,13 +50,13 @@ HWND TabControl::AddTabWindow(wchar_t* className, wchar_t* title, DWORD style)
 	return tabHandle;
 }
 
-void TabControl::AddTabDialog(Dialog* dialog, wchar_t* title)
+void TabControl::AddTabDialog(Dialog* dialog, const wchar_t* title)
 {
 	HWND handle = dialog->GetDlgHandle();
 	AddTab(handle,title);
 }
 
-void TabControl::AddTab(HWND handle, wchar_t* title)
+void TabControl::AddTab(HWND handle, const wchar_t* title)
 {
 	if (showTabTitles)
 		AppendPageToControl(title);
@@ -93,13 +93,13 @@ void TabControl::AddTab(HWND handle, wchar_t* title)
 	ShowTab(index);
 }
 
-int TabControl::AppendPageToControl(wchar_t* title)
+int TabControl::AppendPageToControl(const wchar_t *title)
 {
 	TCITEM tcItem;
 	ZeroMemory (&tcItem,sizeof (tcItem));
 	tcItem.mask			= TCIF_TEXT;
 	tcItem.dwState		= 0;
-	tcItem.pszText		= title;
+	tcItem.pszText		= (LPTSTR)title;
 	tcItem.cchTextMax	= (int)wcslen(tcItem.pszText)+1;
 	tcItem.iImage		= 0;
 
@@ -304,4 +304,4 @@ LRESULT CALLBACK TabControl::wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 	}
 
 	return (LRESULT)CallWindowProc((WNDPROC)tabControl->oldProc,hwnd,msg,wParam,lParam);
-}
\ No newline at end of file
+}
diff --git a/Windows/W32Util/TabControl.h b/Windows/W32Util/TabControl.h
index 4640ec40c9..e6229166c4 100644
--- a/Windows/W32Util/TabControl.h
+++ b/Windows/W32Util/TabControl.h
@@ -11,9 +11,9 @@ class TabControl
 public:
 	TabControl(HWND handle, bool noDisplayArea = false);
 	void HandleNotify(LPARAM lParam);
-	HWND AddTabWindow(wchar_t* className, wchar_t* title, DWORD style = 0);
-	void AddTabDialog(Dialog* dialog, wchar_t* title);
-	void AddTab(HWND hwnd, wchar_t* title);
+	HWND AddTabWindow(const wchar_t* className, const wchar_t* title, DWORD style = 0);
+	void AddTabDialog(Dialog* dialog, const wchar_t* title);
+	void AddTab(HWND hwnd, const wchar_t* title);
 	void ShowTab(int index, bool setControlIndex = true);
 	void ShowTab(HWND pageHandle);
 	void NextTab(bool cycle);
@@ -33,7 +33,7 @@ public:
 private:
 	static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 	void OnResize();
-	int AppendPageToControl(wchar_t* title);
+	int AppendPageToControl(const wchar_t* title);
 
 	struct TabInfo
 	{
@@ -52,4 +52,4 @@ private:
 	int currentTab;
 	bool hasButtons;
 	bool noDisplayArea_;
-};
\ No newline at end of file
+};
diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
index f6110b5493..ce306cbfe0 100644
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@@ -247,7 +247,7 @@ void WindowsHost::BootDone() {
 	Core_EnableStepping(!g_Config.bAutoRun);
 }
 
-static std::string SymbolMapFilename(const char *currentFilename, char* ext) {
+static std::string SymbolMapFilename(const char *currentFilename, const char* ext) {
 	FileInfo info;
 
 	std::string result = currentFilename;
@@ -256,9 +256,9 @@ static std::string SymbolMapFilename(const char *currentFilename, char* ext) {
 	getFileInfo(currentFilename, &info);
 	if (info.isDirectory) {
 #ifdef _WIN32
-		char* slash = "\\";
+		const char* slash = "\\";
 #else
-		char* slash = "/";
+		const char* slash = "/";
 #endif
 		if (!endsWith(result,slash))
 			result += slash;
diff --git a/Windows/WindowsHost.h b/Windows/WindowsHost.h
index d7d2198c35..f05aeca316 100644
--- a/Windows/WindowsHost.h
+++ b/Windows/WindowsHost.h
@@ -18,6 +18,7 @@
 #include "../Core/Host.h"
 #include "InputDevice.h"
 #include "KeyboardDevice.h"
+#include "Common/CommonWindows.h"
 #include <list>
 #include <memory>
 
diff --git a/Windows/XinputDevice.cpp b/Windows/XinputDevice.cpp
index d1f40f7e83..575f4891d4 100644
--- a/Windows/XinputDevice.cpp
+++ b/Windows/XinputDevice.cpp
@@ -5,6 +5,7 @@
 
 #include "base/NativeApp.h"
 #include "Core/Config.h"
+#include "Common/CommonWindows.h"
 #include "Common/KeyMap.h"
 #include "Common/Log.h"
 #include "input/input_state.h"
diff --git a/Windows/main.cpp b/Windows/main.cpp
index 0e9259b93d..cf04660d4e 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include "stdafx.h"
 #include <algorithm>
 #include <cmath>
 
diff --git a/Windows/mingw_defines.h b/Windows/mingw_defines.h
new file mode 100644
index 0000000000..ff49b2dbaa
--- /dev/null
+++ b/Windows/mingw_defines.h
@@ -0,0 +1,237 @@
+
+/* these defines are needed when using the msvc headers from the dx9sdk directory with mingw */
+
+#pragma once
+
+#define WINAPI_FAMILY_ONE_PARTITION(vset, v) ((WINAPI_FAMILY & vset) == v)
+
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
+/* Pointer parameters */
+#define _In_
+#define _Out_
+#define _Inout_
+#define _In_z_
+#define _Inout_z_
+#define _In_reads_(s)
+#define _In_reads_bytes_(s)
+#define _In_reads_z_(s)
+#define _In_reads_or_z_(s)
+#define _Out_writes_(s)
+#define _Out_writes_bytes_(s)
+#define _Out_writes_z_(s)
+#define _Inout_updates_(s)
+#define _Inout_updates_bytes_(s)
+#define _Inout_updates_z_(s)
+#define _Out_writes_to_(s,c)
+#define _Out_writes_bytes_to_(s, c)
+#define _Out_writes_all_(s)
+#define _Out_writes_bytes_all_(s)
+#define _Inout_updates_to_(s, c)
+#define _Inout_updates_bytes_to_(s, c)
+#define _Inout_updates_all_(s)
+#define _Inout_updates_bytes_all_(s)
+#define _In_reads_to_ptr_(p)
+#define _In_reads_to_ptr_z_(p)
+#define _Out_writes_to_ptr_(p)
+#define _Out_writes_to_ptr_z(p)
+
+/* Optional pointer parameters */
+#define __in_opt
+#define __out_opt
+#define __inout_opt
+#define _In_opt_
+#define _Out_opt_
+#define _Inout_opt_
+#define _In_opt_z_
+#define _Inout_opt_z_
+#define _In_reads_opt_(s)
+#define _In_reads_bytes_opt_(s)
+#define _In_reads_opt_z_(s)
+
+#define _Out_writes_opt_(s)
+#define _Out_writes_opt_z_(s)
+#define _Inout_updates_opt_(s)
+#define _Inout_updates_bytes_opt_(s)
+#define _Inout_updates_opt_z_(s)
+#define _Out_writes_to_opt_(s, c)
+#define _Out_writes_bytes_to_opt_(s, c)
+#define _Out_writes_all_opt_(s)
+#define _Out_writes_bytes_all_opt_(s)
+
+#define _Inout_updates_to_opt_(s, c)
+#define _Inout_updates_bytes_to_opt_(s, c)
+#define _Inout_updates_all_opt_(s)
+#define _Inout_updates_bytes_all_opt_(s)
+#define _In_reads_to_ptr_opt_(p)
+#define _In_reads_to_ptr_opt_z_(p)
+#define _Out_writes_to_ptr_opt_(p)
+#define _Out_writes_to_ptr_opt_z_(p)
+
+/* Output pointer parameters */
+#define _Outptr_
+#define _Outptr_opt_
+#define _Outptr_result_maybenull_
+#define _Outptr_opt_result_maybenull_
+#define _Outptr_result_z_
+#define _Outptr_opt_result_z_
+#define _Outptr_result_maybenull_z_
+#define _Outptr_opt_result_maybenull_z_
+#define _COM_Outptr_
+#define _COM_Outptr_opt_
+#define _COM_Outptr_result_maybenull_
+#define _COM_Outptr_opt_result_maybenull_
+#define _Outptr_result_buffer_(s)
+#define _Outptr_result_bytebuffer_(s)
+#define _Outptr_opt_result_buffer_(s)
+#define _Outptr_opt_result_bytebuffer_(s)
+#define _Outptr_result_buffer_to_(s, c)
+#define _Outptr_result_bytebuffer_to_(s, c)
+#define _Outptr_result_bytebuffer_maybenull_(s)
+#define _Outptr_opt_result_buffer_to_(s, c)
+#define _Outptr_opt_result_bytebuffer_to_(s, c)
+#define _Result_nullonfailure_
+#define _Result_zeroonfailure_
+#define _Outptr_result_nullonfailure_
+#define _Outptr_opt_result_nullonfailure_
+#define _Outref_result_nullonfailure_
+
+/* Output reference parameters */
+#define _Outref_
+#define _Outref_result_maybenull_
+#define _Outref_result_buffer_(s)
+#define _Outref_result_bytebuffer_(s)
+#define _Outref_result_buffer_to_(s, c)
+#define _Outref_result_bytebuffer_to_(s, c)
+#define _Outref_result_buffer_all_(s)
+#define _Outref_result_bytebuffer_all_(s)
+#define _Outref_result_buffer_maybenull_(s)
+#define _Outref_result_bytebuffer_maybenull_(s)
+#define _Outref_result_buffer_to_maybenull_(s, c)
+#define _Outref_result_bytebuffer_to_maybenull_(s, c)
+#define _Outref_result_buffer_all_maybenull_(s)
+#define _Outref_result_bytebuffer_all_maybenull_(s)
+
+/* Return values */
+#define _Ret_z_
+#define _Ret_writes_(s)
+#define _Ret_writes_bytes_(s)
+#define _Ret_writes_z_(s)
+#define _Ret_writes_bytes_to_(s, c)
+#define _Ret_writes_maybenull_(s)
+#define _Ret_writes_to_maybenull_(s, c)
+#define _Ret_writes_maybenull_z_(s)
+#define _Ret_maybenull_
+#define _Ret_maybenull_z_
+#define _Ret_null_
+#define _Ret_notnull_
+#define _Ret_writes_bytes_to_(s, c)
+#define _Ret_writes_bytes_maybenull_(s)
+#define _Ret_writes_bytes_to_maybenull_(s, c)
+
+/* Other common annotations */
+#define _In_range_(low, hi)
+#define _Out_range_(low, hi)
+#define _Ret_range_(low, hi)
+#define _Deref_in_range_(low, hi)
+#define _Deref_out_range_(low, hi)
+#define _Deref_inout_range_(low, hi)
+#define _Pre_equal_to_(expr)
+#define _Post_equal_to_(expr)
+#define _Struct_size_bytes_(size)
+
+/* Function annotations */
+#define _Called_from_function_class_(name)
+#define _Check_return_ __checkReturn
+#define _Function_class_(name)
+#define _Raises_SEH_exception_
+#define _Maybe_raises_SEH_exception_
+#define _Must_inspect_result_
+#define _Use_decl_annotations_
+
+/* Success/failure annotations */
+#define _Always_(anno_list)
+#define _On_failure_(anno_list)
+#define _Return_type_success_(expr)
+#define _Success_(expr)
+
+#define _Reserved_
+#define _Const_
+
+/* Buffer properties */
+#define _Readable_bytes_(s)
+#define _Readable_elements_(s)
+#define _Writable_bytes_(s)
+#define _Writable_elements_(s)
+#define _Null_terminated_
+#define _NullNull_terminated_
+#define _Pre_readable_size_(s)
+#define _Pre_writable_size_(s)
+#define _Pre_readable_byte_size_(s)
+#define _Pre_writable_byte_size_(s)
+#define _Post_readable_size_(s)
+#define _Post_writable_size_(s)
+#define _Post_readable_byte_size_(s)
+#define _Post_writable_byte_size_(s)
+
+/* Field properties */
+#define _Field_size_(s)
+#define _Field_size_full_(s)
+#define _Field_size_full_opt_(s)
+#define _Field_size_opt_(s)
+#define _Field_size_part_(s, c)
+#define _Field_size_part_opt_(s, c)
+#define _Field_size_bytes_(size)
+#define _Field_size_bytes_full_(size)
+#define _Field_size_bytes_full_opt_(s)
+#define _Field_size_bytes_opt_(s)
+#define _Field_size_bytes_part_(s, c)
+#define _Field_size_bytes_part_opt_(s, c)
+#define _Field_z_
+#define _Field_range_(min, max)
+
+/* Structural annotations */
+#define _At_(e, a)
+#define _At_buffer_(e, i, c, a)
+#define _Group_(a)
+#define _When_(e, a)
+
+/* printf/scanf annotations */
+#define _Printf_format_string_
+#define _Scanf_format_string_
+#define _Scanf_s_format_string_
+#define _Format_string_impl_(kind,where)
+#define _Printf_format_string_params_(x)
+#define _Scanf_format_string_params_(x)
+#define _Scanf_s_format_string_params_(x)
+
+/* Analysis */
+#define _Analysis_assume_(expr)
+#define _Analysis_assume_nullterminated_(expr)
+
+#define __in
+#define __out
+#define __deref_out
+
+#define __in_bcount(size)
+#define __in_bcount_opt(size)
+#define __in_ecount(size)
+#define __out_bcount(size)
+#define __out_bcount_opt(size)
+#define __out_bcount_part(size, length)
+#define __out_ecount(size)
+#define __out_ecount_opt(size)
+#define __inout
+#define __deref_out_bcount(size)
+#define __deref_opt_out_bcount(size)
+#define __deref_out_ecount(size)
+#define __in_ecount_opt(s)
+
+#define _In_
+#define _In_opt_
+#define _Null_
+#define _Out_writes_bytes_opt_(s)
+#define _Out_writes_bytes_(s)
+#define _In_reads_bytes_(s)
+#define _Inout_opt_bytecount_(s)
+
+#define __reserved
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 7b70ee2c09..e0eb1e84e1 100644
--- a/Windows/ppsspp.rc
+++ b/Windows/ppsspp.rc
@@ -111,8 +111,48 @@ END
 // Version
 //
 
-#include "version.rc"
+// no utf-16 support when using mingw's resource compiler
+#ifdef __MINGW32__
+// win-version.h is generated by git-version-gen.cmd.
+#include "win-version.h"
 
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION PPSSPP_WIN_VERSION_COMMA
+ PRODUCTVERSION PPSSPP_WIN_VERSION_COMMA
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "PPSSPP PSP emulator"
+            VALUE "CompanyName", "Henrik Rydgård"
+            VALUE "FileDescription", "PPSSPP"
+            VALUE "FileVersion", PPSSPP_WIN_VERSION_STRING
+            VALUE "InternalName", "PPSSPPEmu"
+            VALUE "LegalCopyright", "Copyright (C) 2006-2015 by Henrik Rydgård"
+            VALUE "LegalTrademarks", "All product names are trademarks of their respective owners."
+            VALUE "OriginalFilename", "PPSSPP.exe"
+            VALUE "ProductName", "PPSSPP"
+            VALUE "ProductVersion", PPSSPP_WIN_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+#else
+#include "version.rc"
+#endif
 
 #endif    // Neutral (Default) resources
 /////////////////////////////////////////////////////////////////////////////
@@ -228,8 +268,27 @@ BEGIN
     CONTROL         "",IDC_GEDBG_MATRICES,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER | WS_TABSTOP,7,7,217,86
 END
 
-
+// no utf-16 support when using mingw's resource compiler
+#ifdef __MINGW32__
+IDD_ABOUTBOX DIALOGEX 0, 0, 301, 163
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "About"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,243,140,50,14
+    ICON            IDI_PPSSPP,IDC_STATIC,10,9,21,20
+    LTEXT           "PPSSPP",IDC_VERSION,40,8,127,9
+    LTEXT           "Copyright (c) by Henrik Rydgård  the PPSSPP project 2012-",IDC_STATIC,40,33,253,8
+    LTEXT           "All trademarks are property of their respective owners.\nThe emulator is for educational and development purposes only and it may not be used to play games you do not legally own.",IDC_STATIC,40,102,253,24
+    LTEXT           "PSP emulator and debugger",IDC_STATIC,40,19,253,8
+    LTEXT           "CISO decompression code by BOOSTER",IDC_STATIC,48,73,240,8
+    LTEXT           "PSPSDK by #pspdev (freenode)",IDC_STATIC,48,62,240,8
+    LTEXT           "zlib by Jean-loup Gailly (compression) and Mark Adler (decompression)",IDC_STATIC,48,85,240,8
+    LTEXT           "Additional credits:",IDC_STATIC,40,49,253,8
+END
+#else
 #include "aboutbox.rc"
+#endif
 
 IDD_MEMORY DIALOGEX 0, 0, 566, 287
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
@@ -466,7 +525,7 @@ BEGIN
         MENUITEM "Ignore Windows Key",                      ID_OPTIONS_IGNOREWINKEY
         MENUITEM "Language...",                             ID_OPTIONS_LANGUAGE
         MENUITEM "Control Mapping...",                      ID_OPTIONS_CONTROLS
-        MENUITEM "Display Layout Editor"                    ID_OPTIONS_DISPLAY_LAYOUT
+        MENUITEM "Display Layout Editor",                   ID_OPTIONS_DISPLAY_LAYOUT
         MENUITEM "More Settings...",                        ID_OPTIONS_MORE_SETTINGS
         MENUITEM SEPARATOR
         MENUITEM "Fullscreen",                              ID_OPTIONS_FULLSCREEN
@@ -502,10 +561,10 @@ BEGIN
 
         POPUP "Backend"
         BEGIN
-            MENUITEM "Direct3D9" ID_OPTIONS_DIRECT3D9
-            MENUITEM "Direct3D11" ID_OPTIONS_DIRECT3D11
-            MENUITEM "OpenGL" ID_OPTIONS_OPENGL
-            MENUITEM "Vulkan" ID_OPTIONS_VULKAN
+            MENUITEM "Direct3D9",                           ID_OPTIONS_DIRECT3D9
+            MENUITEM "Direct3D11",                          ID_OPTIONS_DIRECT3D11
+            MENUITEM "OpenGL",                              ID_OPTIONS_OPENGL
+            MENUITEM "Vulkan",                              ID_OPTIONS_VULKAN
         END
 
         POPUP "Rendering Mode"
@@ -640,7 +699,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Run to Cursor",              ID_DISASM_RUNTOHERE
         MENUITEM "Jump to Cursor",             ID_DISASM_SETPCTOHERE
-        MENUITEM "Set Stall"                   ID_GEDBG_SETSTALLADDR
+        MENUITEM "Set Stall",                  ID_GEDBG_SETSTALLADDR
         MENUITEM "Toggle Breakpoint",          ID_DISASM_TOGGLEBREAKPOINT
         MENUITEM SEPARATOR
         MENUITEM "Go to Displaylist PC",       ID_GEDBG_GOTOPC
@@ -661,7 +720,7 @@ BEGIN
     POPUP "gepreviewoptions"
     BEGIN
         MENUITEM "Export Image...",            ID_GEDBG_EXPORT_IMAGE
-        MENUITEM "Show Prim Preview"           ID_GEDBG_ENABLE_PREVIEW
+        MENUITEM "Show Prim Preview",          ID_GEDBG_ENABLE_PREVIEW
         MENUITEM "Show Replacement Filename"   ID_GEDBG_REPLACEMENT_FILENAME
     END
 END
diff --git a/Windows/stdafx.h b/Windows/stdafx.h
index 8d896ecfb5..a7f4a49287 100644
--- a/Windows/stdafx.h
+++ b/Windows/stdafx.h
@@ -19,19 +19,16 @@
 
 #pragma warning(disable:4996)
 
-// WinSock2 MUST be included before <windows.h> !!!
-#include <WinSock2.h>
-
 #undef _WIN32_WINNT
 
-#if _MSC_VER < 1700
+#if defined(_MSC_VER) && _MSC_VER < 1700
 #error You need a newer version of Visual Studio
 #else
-#define _WIN32_WINNT 0x600 // Compile for Vista on Visual Studio 2012 and above
+#define _WIN32_WINNT 0x601 // Compile for Win7 on Visual Studio 2012 and above
 #endif
 
 #undef WINVER
-#define WINVER 0x0600
+#define WINVER _WIN32_WINNT
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x0600       // Default value is 0x0400
 #endif
@@ -47,6 +44,16 @@
 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
 #endif
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
+// WinSock2 MUST be included before <windows.h> !!!
+#include <WinSock2.h>
+
 #include "Common/CommonWindows.h"
 
 #include <windowsx.h>
diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index 335230f3ef..9ebb82dc0b 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -791,19 +791,17 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_sendMessage(JNIEnv *env
 		ILOG("STORAGE PERMISSION: PENDING");
 		// TODO: Add support for other permissions
 		permissions[SYSTEM_PERMISSION_STORAGE] = PERMISSION_STATUS_PENDING;
-		NativePermissionStatus(SYSTEM_PERMISSION_STORAGE, PERMISSION_STATUS_PENDING);
 	} else if (msg == "permission_denied") {
 		ILOG("STORAGE PERMISSION: DENIED");
 		permissions[SYSTEM_PERMISSION_STORAGE] = PERMISSION_STATUS_DENIED;
-		NativePermissionStatus(SYSTEM_PERMISSION_STORAGE, PERMISSION_STATUS_PENDING);
 	} else if (msg == "permission_granted") {
 		ILOG("STORAGE PERMISSION: GRANTED");
 		permissions[SYSTEM_PERMISSION_STORAGE] = PERMISSION_STATUS_GRANTED;
-		NativePermissionStatus(SYSTEM_PERMISSION_STORAGE, PERMISSION_STATUS_PENDING);
 	} else if (msg == "sustained_perf_supported") {
 		sustainedPerfSupported = true;
 	}
 
+	// Ensures that the receiver can handle it on a sensible thread.
 	NativeMessageReceived(msg.c_str(), prm.c_str());
 }
 
@@ -906,7 +904,7 @@ static void ProcessFrameCommands(JNIEnv *env) {
 		frameCmd = frameCommands.front();
 		frameCommands.pop();
 
-		WLOG("frameCommand! '%s' '%s'", frameCmd.command.c_str(), frameCmd.params.c_str());
+		ILOG("frameCommand '%s' '%s'", frameCmd.command.c_str(), frameCmd.params.c_str());
 
 		jstring cmd = env->NewStringUTF(frameCmd.command.c_str());
 		jstring param = env->NewStringUTF(frameCmd.params.c_str());
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
index 96dadd6cf0..2fe9aba358 100644
--- a/android/src/org/ppsspp/ppsspp/NativeActivity.java
+++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -530,25 +530,12 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
     }
 
 	private Point desiredSize = new Point();
-	private int badOrientationCount = 0;
 	@Override
 	public void surfaceCreated(SurfaceHolder holder) {
 		pixelWidth = holder.getSurfaceFrame().width();
 		pixelHeight = holder.getSurfaceFrame().height();
 
-		// Workaround for terrible bug when locking and unlocking the screen in landscape mode on Nexus 5X.
 		int requestedOr = getRequestedOrientation();
-		boolean requestedPortrait = requestedOr == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOr == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
-		boolean detectedPortrait = pixelHeight > pixelWidth;
-		if (badOrientationCount < 3 && requestedPortrait != detectedPortrait && requestedOr != ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED) {
-			Log.e(TAG, "Bad orientation detected (w=" + pixelWidth + " h=" + pixelHeight + "! Recreating activity.");
-			badOrientationCount++;
-			recreate();
-			return;
-		} else if (requestedPortrait == detectedPortrait) {
-			badOrientationCount = 0;
-		}
-
 		Log.d(TAG, "Surface created. pixelWidth=" + pixelWidth + ", pixelHeight=" + pixelHeight + " holder: " + holder.toString() + " or: " + requestedOr);
 		NativeApp.setDisplayParameters(pixelWidth, pixelHeight, (int)densityDpi, refreshRate);
 		getDesiredBackbufferSize(desiredSize);
@@ -1091,7 +1078,6 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
     	dlg.show();
     }
 
-
     public boolean processCommand(String command, String params) {
     	SurfaceView surfView = javaGL ? mGLSurfaceView : mSurfaceView;
 		if (command.equals("launchBrowser")) {
@@ -1204,7 +1190,7 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
 			Log.i(TAG, "Launching inputbox: " + title + " " + defString);
 			inputBox(title, defString, "OK");
 			return true;
-		} else if (command.equals("vibrate") && surfView != null) {
+		} else if (command.equals("vibrate")) {
 			int milliseconds = -1;
 			if (params != "") {
 				try {
@@ -1219,20 +1205,24 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
 			// -3 = Long press feedback
 			// Note that these three do not require the VIBRATE Android
 			// permission.
-			switch (milliseconds) {
-			case -1:
-				surfView.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
-				break;
-			case -2:
-				surfView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
-				break;
-			case -3:
-				surfView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-				break;
-			default:
-				// Requires the vibrate permission, which we don't have, so disabled.
-				// vibrator.vibrate(milliseconds);
-				break;
+			if (surfView != null) {
+				switch (milliseconds) {
+					case -1:
+						surfView.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
+						break;
+					case -2:
+						surfView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
+						break;
+					case -3:
+						surfView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
+						break;
+					default:
+						// Requires the vibrate permission, which we don't have, so disabled.
+						// vibrator.vibrate(milliseconds);
+						break;
+				}
+			} else {
+				Log.e(TAG, "Can't vibrate, no surface view");
 			}
 			return true;
 		} else if (command.equals("finish")) {
diff --git a/assets/lang b/assets/lang
index 465f6bc726..4cc7fcdf7e 160000
--- a/assets/lang
+++ b/assets/lang
@@ -1 +1 @@
-Subproject commit 465f6bc726cdc0e6fe186db6efe63fa09cefdc9b
+Subproject commit 4cc7fcdf7e821e9472220b8112741ed9ecafa6de
diff --git a/assets/shaders/defaultshaders.ini b/assets/shaders/defaultshaders.ini
index c3c6bf59b7..0750cf11f8 100644
--- a/assets/shaders/defaultshaders.ini
+++ b/assets/shaders/defaultshaders.ini
@@ -14,6 +14,10 @@ Vertex=fxaa.vsh
 Name=Natural Colors
 Fragment=natural.fsh
 Vertex=natural.vsh
+[NaturalA]
+Name=Natural Colors (No Blur)
+Fragment=naturalA.fsh
+Vertex=natural.vsh
 [Vignette]
 Name=Vignette
 Author=Henrik
@@ -82,4 +86,4 @@ Name=Video aware guest.r AA 4.o
 Author=guest.r(tweak by LunaMoo)
 Fragment=videoAA.fsh
 Vertex=fxaa.vsh
-OutputResolution=True
\ No newline at end of file
+OutputResolution=True
diff --git a/assets/shaders/naturalA.fsh b/assets/shaders/naturalA.fsh
new file mode 100644
index 0000000000..8e396464ca
--- /dev/null
+++ b/assets/shaders/naturalA.fsh
@@ -0,0 +1,39 @@
+// Natural Vision Shader with removed blur.
+
+// by ShadX (Modded by SimoneT and Leopard20)
+// http://forums.ngemu.com/showthread.php?t=76098
+
+#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+#endif
+
+uniform sampler2D sampler0;
+varying vec4 v_texcoord0;
+varying vec4 v_texcoord1;
+varying vec4 v_texcoord2;
+varying vec4 v_texcoord3;
+
+const mat3 RGBtoYIQ = mat3(0.299, 0.596, 0.212, 
+                           0.587,-0.275,-0.523, 
+                           0.114,-0.321, 0.311);
+
+const mat3 YIQtoRGB = mat3(1.0, 1.0, 1.0,
+                           0.95568806036115671171,-0.27158179694405859326,-1.1081773266826619523,
+                           0.61985809445637075388,-0.64687381613840131330, 1.7050645599191817149);
+
+const vec3 val00 = vec3( 1.2, 1.2, 1.2);
+
+void main()
+{
+vec3 c0,c1;
+
+c0 = texture2D(sampler0,v_texcoord0.xy).xyz;
+
+c1=RGBtoYIQ*c0;
+
+c1=vec3(pow(c1.x,val00.x),c1.yz*val00.yz);
+
+gl_FragColor.rgb=YIQtoRGB*c1;
+gl_FragColor.a = 1.0;
+}
diff --git a/b.sh b/b.sh
index dbd616245f..fc0d02d50e 100755
--- a/b.sh
+++ b/b.sh
@@ -37,6 +37,9 @@ do
 		--headless) echo "Headless mode enabled"
 			CMAKE_ARGS="-DHEADLESS=ON ${CMAKE_ARGS}"
 			;;
+		--libretro) echo "Build Libretro core"
+			CMAKE_ARGS="-DLIBRETRO=ON ${CMAKE_ARGS}"
+			;;
 		--unittest) echo "Build unittest"
 			CMAKE_ARGS="-DUNITTEST=ON ${CMAKE_ARGS}"
 			;;
diff --git a/ext/native/base/NativeApp.h b/ext/native/base/NativeApp.h
index dd07afb996..36ef2d3d8b 100644
--- a/ext/native/base/NativeApp.h
+++ b/ext/native/base/NativeApp.h
@@ -97,25 +97,11 @@ void NativeSetMixer(void* mixer);
 void NativeShutdownGraphics();
 void NativeShutdown();
 
-// Called on app.onCreate and app.onDestroy (?). Tells the app to save/restore
-// light state. If app was fully rebooted between these calls, it's okay if some minor
-// state is lost (position in level) but the level currently playihg, or the song
-// currently being edited, or whatever, should be restored properly. In this case,
-// firstTime will be set so that appropriate action can be taken (or not taken when
-// it's not set).
-//
-// Note that NativeRestore is always called on bootup.
-void NativeRestoreState(bool firstTime);  // onCreate
-void NativeSaveState();  // onDestroy
-
-void NativePermissionStatus(SystemPermission permission, PermissionStatus status);
-
 // Calls back into Java / SDL
 // These APIs must be implemented by every port (for example app-android.cpp, SDLMain.cpp).
 // You are free to call these.
 void SystemToast(const char *text);
 void ShowKeyboard();
-void ShowAd(int x, int y, bool center_x);
 
 // Vibrate either takes a number of milliseconds to vibrate unconditionally,
 // or you can specify these constants for "standard" feedback. On Android,
diff --git a/ext/native/base/basictypes.h b/ext/native/base/basictypes.h
index 48fb002a7c..8cd0fd0e1e 100644
--- a/ext/native/base/basictypes.h
+++ b/ext/native/base/basictypes.h
@@ -54,7 +54,7 @@ inline uint32_t swap32(const uint8_t* _pData) {return swap32(*(const uint32_t*)_
 inline uint64_t swap64(const uint8_t* _pData) {return swap64(*(const uint64_t*)_pData);}
 
 // Thread local storage
-#ifdef _WIN32
+#ifdef _MSC_VER
 #define __THREAD __declspec( thread ) 
 #else
 #define __THREAD __thread
diff --git a/ext/native/file/file_util.cpp b/ext/native/file/file_util.cpp
index 270ebeb7ef..be654ef9c3 100644
--- a/ext/native/file/file_util.cpp
+++ b/ext/native/file/file_util.cpp
@@ -172,7 +172,6 @@ bool getFileInfo(const char *path, FileInfo *fileInfo) {
 	int result = stat64(copy.c_str(), &file_info);
 #endif
 	if (result < 0) {
-		WLOG("IsDirectory: stat failed on %s", path);
 		fileInfo->exists = false;
 		return false;
 	}
diff --git a/ext/native/gfx/d3d9_shader.cpp b/ext/native/gfx/d3d9_shader.cpp
index 5e38a5363a..51b918c21d 100644
--- a/ext/native/gfx/d3d9_shader.cpp
+++ b/ext/native/gfx/d3d9_shader.cpp
@@ -1,4 +1,4 @@
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 #include "d3d9_shader.h"
 #include "thin3d/d3dx9_loader.h"
@@ -88,4 +88,4 @@ bool CompileVertexShader(LPDIRECT3DDEVICE9 device, const char *code, LPDIRECT3DV
 
 }  // namespace
 
-#endif
\ No newline at end of file
+#endif
diff --git a/ext/native/gfx/d3d9_shader.h b/ext/native/gfx/d3d9_shader.h
index e16ebcd129..289ed24954 100644
--- a/ext/native/gfx/d3d9_shader.h
+++ b/ext/native/gfx/d3d9_shader.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Common/CommonWindows.h"
-
+#include <initguid.h>
 #include <string>
 #include <d3d9.h>
 
diff --git a/ext/native/gfx/d3d9_state.cpp b/ext/native/gfx/d3d9_state.cpp
index 4fadf21b44..aa20d88151 100644
--- a/ext/native/gfx/d3d9_state.cpp
+++ b/ext/native/gfx/d3d9_state.cpp
@@ -1,4 +1,4 @@
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 #include "d3d9_state.h"
 #include <assert.h>
diff --git a/ext/native/gfx_es2/gpu_features.cpp b/ext/native/gfx_es2/gpu_features.cpp
index 966781cc75..679c0c2b52 100644
--- a/ext/native/gfx_es2/gpu_features.cpp
+++ b/ext/native/gfx_es2/gpu_features.cpp
@@ -270,7 +270,6 @@ void CheckGLExtensions() {
 		}
 	}
 
-#ifndef __LIBRETRO__
 #ifdef WIN32
 	const char *wglString = 0;
 	if (wglGetExtensionsStringEXT)
@@ -284,7 +283,6 @@ void CheckGLExtensions() {
 #elif !defined(USING_GLES2)
 	// const char *glXString = glXQueryExtensionString();
 	// gl_extensions.EXT_swap_control_tear = strstr(glXString, "GLX_EXT_swap_control_tear") != 0;
-#endif
 #endif
 
 	// Check the desktop extension instead of the OES one. They are very similar.
diff --git a/ext/native/i18n/i18n.h b/ext/native/i18n/i18n.h
index c57bc81f55..ede7f1e8a6 100644
--- a/ext/native/i18n/i18n.h
+++ b/ext/native/i18n/i18n.h
@@ -77,6 +77,9 @@ public:
 	std::string LanguageID();
 
 	I18NCategory *GetCategory(const char *categoryName);
+	bool HasCategory(const char *categoryName) const {
+		return cats_.find(categoryName) != cats_.end();
+	}
 	const char *T(const char *category, const char *key, const char *def = 0);
 
 private:
@@ -101,6 +104,10 @@ inline I18NCategory *GetI18NCategory(const char *categoryName) {
 	return i18nrepo.GetCategory(categoryName);
 }
 
+inline bool I18NCategoryLoaded(const char *categoryName) {
+	return i18nrepo.HasCategory(categoryName);
+}
+
 inline const char *T(const char *category, const char *key, const char *def = 0) {
 	return i18nrepo.T(category, key, def);
 }
diff --git a/ext/native/thin3d/d3dx9_loader.cpp b/ext/native/thin3d/d3dx9_loader.cpp
index 6a1893a37f..d7e5fa807f 100644
--- a/ext/native/thin3d/d3dx9_loader.cpp
+++ b/ext/native/thin3d/d3dx9_loader.cpp
@@ -4,6 +4,7 @@
 #include <vector>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdexcept>
 
 #include "base/logging.h"
 #include "thin3d/d3dx9_loader.h"
@@ -184,4 +185,4 @@ HRESULT dyn_D3DXCompileShader(LPCSTR pSrcData, UINT srcDataLen, CONST D3DXMACRO*
 	return m_TFunc_D3DXCompileShader(pSrcData, srcDataLen, pDefines,
 		pInclude, pFunctionName, pProfile,
 		Flags, ppShader, ppErrorMsgs, ppConstantTable);
-}
\ No newline at end of file
+}
diff --git a/ext/native/thin3d/thin3d_d3d11.cpp b/ext/native/thin3d/thin3d_d3d11.cpp
index 2b2c761279..9cb46b3fc6 100644
--- a/ext/native/thin3d/thin3d_d3d11.cpp
+++ b/ext/native/thin3d/thin3d_d3d11.cpp
@@ -13,11 +13,17 @@
 #include "Common/ColorConv.h"
 
 #include <cassert>
+#include <cfloat>
 #include <D3DCommon.h>
 #include <d3d11.h>
 #include <d3d11_1.h>
 #include <d3dcompiler.h>
 
+#ifdef __MINGW32__
+#undef __uuidof
+#define __uuidof(type) IID_##type
+#endif
+
 namespace Draw {
 
 // A problem is that we can't get the D3Dcompiler.dll without using a later SDK than 7.1, which was the last that
@@ -92,6 +98,8 @@ public:
 	void DrawUP(const void *vdata, int vertexCount) override;
 	void Clear(int mask, uint32_t colorval, float depthVal, int stencilVal);
 
+	void BeginFrame() override;
+
 	std::string GetInfoString(InfoField info) const override {
 		switch (info) {
 		case APIVERSION: return "Direct3D 11";
@@ -717,13 +725,14 @@ public:
 };
 
 Texture *D3D11DrawContext::CreateTexture(const TextureDesc &desc) {
-	D3D11Texture *tex = new D3D11Texture(desc);
 
 	if (!(GetDataFormatSupport(desc.format) & FMT_TEXTURE)) {
 		// D3D11 does not support this format as a texture format.
-		return false;
+		return nullptr;
 	}
 
+	D3D11Texture *tex = new D3D11Texture(desc);
+
 	bool generateMips = desc.generateMips;
 	if (desc.generateMips && !(GetDataFormatSupport(desc.format) & FMT_AUTOGEN_MIPS)) {
 		// D3D11 does not support autogenerating mipmaps for this format.
@@ -1267,6 +1276,34 @@ void D3D11DrawContext::Clear(int mask, uint32_t colorval, float depthVal, int st
 	}
 }
 
+void D3D11DrawContext::BeginFrame() {
+	context_->OMSetRenderTargets(1, &curRenderTargetView_, curDepthStencilView_);
+
+	if (curBlend_) {
+		context_->OMSetBlendState(curBlend_->bs, blendFactor_, 0xFFFFFFFF);
+	}
+	if (curDepth_) {
+		context_->OMSetDepthStencilState(curDepth_->dss, stencilRef_);
+	}
+	if (curRaster_) {
+		context_->RSSetState(curRaster_->rs);
+	}
+	context_->IASetInputLayout(curInputLayout_);
+	context_->VSSetShader(curVS_, nullptr, 0);
+	context_->PSSetShader(curPS_, nullptr, 0);
+	context_->GSSetShader(curGS_, nullptr, 0);
+	if (curTopology_ != D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED) {
+		context_->IASetPrimitiveTopology(curTopology_);
+	}
+	if (curPipeline_) {
+		context_->IASetVertexBuffers(0, 1, nextVertexBuffers_, (UINT *)curPipeline_->input->strides.data(), (UINT *)nextVertexBufferOffsets_);
+		context_->IASetIndexBuffer(nextIndexBuffer_, DXGI_FORMAT_R32_UINT, nextIndexBufferOffset_);
+		if (curPipeline_->dynamicUniforms) {
+			context_->VSSetConstantBuffers(0, 1, &curPipeline_->dynamicUniforms);
+		}
+	}
+}
+
 void D3D11DrawContext::CopyFramebufferImage(Framebuffer *srcfb, int level, int x, int y, int z, Framebuffer *dstfb, int dstLevel, int dstX, int dstY, int dstZ, int width, int height, int depth, int channelBit) {
 	D3D11Framebuffer *src = (D3D11Framebuffer *)srcfb;
 	D3D11Framebuffer *dst = (D3D11Framebuffer *)dstfb;
diff --git a/ext/native/thin3d/thin3d_d3d9.cpp b/ext/native/thin3d/thin3d_d3d9.cpp
index 627031991d..62321d36c7 100644
--- a/ext/native/thin3d/thin3d_d3d9.cpp
+++ b/ext/native/thin3d/thin3d_d3d9.cpp
@@ -648,7 +648,8 @@ Pipeline *D3D9Context::CreateGraphicsPipeline(const PipelineDesc &desc) {
 	for (auto iter : desc.shaders) {
 		if (!iter) {
 			ELOG("NULL shader passed to CreateGraphicsPipeline");
-			return false;
+			delete pipeline;
+			return NULL;
 		}
 		if (iter->GetStage() == ShaderStage::FRAGMENT) {
 			pipeline->pshader = static_cast<D3D9ShaderModule *>(iter);
diff --git a/ext/native/ui/ui_screen.cpp b/ext/native/ui/ui_screen.cpp
index 092eacec1c..d4f5f0f41d 100644
--- a/ext/native/ui/ui_screen.cpp
+++ b/ext/native/ui/ui_screen.cpp
@@ -836,7 +836,9 @@ void ChoiceWithValueDisplay::Draw(UIContext &dc) {
 
 	I18NCategory *category = GetI18NCategory(category_);
 	std::ostringstream valueText;
-	if (sValue_ != nullptr) {
+	if (translateCallback_ && sValue_) {
+		valueText << translateCallback_(sValue_->c_str());
+	} else if (sValue_ != nullptr) {
 		if (category)
 			valueText << category->T(*sValue_);
 		else
diff --git a/ext/native/ui/ui_screen.h b/ext/native/ui/ui_screen.h
index 3844cba71a..c18de75381 100644
--- a/ext/native/ui/ui_screen.h
+++ b/ext/native/ui/ui_screen.h
@@ -354,17 +354,22 @@ private:
 class ChoiceWithValueDisplay : public UI::Choice {
 public:
 	ChoiceWithValueDisplay(int *value, const std::string &text, LayoutParams *layoutParams = 0)
-		: Choice(text, layoutParams), iValue_(value), category_(nullptr) { sValue_ = nullptr; }
+		: Choice(text, layoutParams), iValue_(value) {}
 
 	ChoiceWithValueDisplay(std::string *value, const std::string &text, const char *category, LayoutParams *layoutParams = 0)
-		: Choice(text, layoutParams), sValue_(value), category_(category) { iValue_ = nullptr; }
+		: Choice(text, layoutParams), sValue_(value), category_(category) {}
+
+	ChoiceWithValueDisplay(std::string *value, const std::string &text, std::string (*translateCallback)(const char *value), LayoutParams *layoutParams = 0)
+		: Choice(text, layoutParams), sValue_(value), translateCallback_(translateCallback) {
+	}
 
 	virtual void Draw(UIContext &dc) override;
 
 private:
-	int *iValue_;
-	std::string *sValue_;
-	const char *category_;
+	int *iValue_ = nullptr;
+	std::string *sValue_ = nullptr;
+	const char *category_ = nullptr;
+	std::string (*translateCallback_)(const char *value) = nullptr;
 };
 
 }  // namespace UI
diff --git a/headless/SDLHeadlessHost.cpp b/headless/SDLHeadlessHost.cpp
index ed60e409d9..a2ec3a9b51 100644
--- a/headless/SDLHeadlessHost.cpp
+++ b/headless/SDLHeadlessHost.cpp
@@ -32,11 +32,13 @@
 #include "GPU/GPUState.h"
 
 #include "base/logging.h"
+#include "base/timeutil.h"
 #include "gfx/gl_common.h"
 #include "gfx_es2/gpu_features.h"
 #include "file/vfs.h"
 #include "file/zip_read.h"
 #include "thin3d/thin3d_create.h"
+#include "thin3d/GLRenderManager.h"
 
 const bool WINDOW_VISIBLE = false;
 const int WINDOW_WIDTH = 480;
@@ -53,20 +55,47 @@ SDL_Window *CreateHiddenWindow() {
 class GLDummyGraphicsContext : public DummyGraphicsContext {
 public:
 	GLDummyGraphicsContext() {
-		CheckGLExtensions();
-		draw_ = Draw::T3DCreateGLContext();
-		SetGPUBackend(GPUBackend::OPENGL);
-		bool success = draw_->CreatePresets();
-		assert(success);
 	}
 	~GLDummyGraphicsContext() { delete draw_; }
 
+	bool InitFromRenderThread(std::string *errorMessage) override;
+
+	void ShutdownFromRenderThread() override {
+		delete draw_;
+		draw_ = nullptr;
+
+		SDL_GL_DeleteContext(glContext_);
+		glContext_ = nullptr;
+		SDL_DestroyWindow(screen_);
+		screen_ = nullptr;
+	}
+
 	Draw::DrawContext *GetDrawContext() override {
 		return draw_;
 	}
 
+	void ThreadStart() override {
+		renderManager_->ThreadStart();
+	}
+
+	bool ThreadFrame() override {
+		return renderManager_->ThreadFrame();
+	}
+
+	void ThreadEnd() override {
+		renderManager_->ThreadEnd();
+	}
+
+	void StopThread() override {
+		renderManager_->WaitUntilQueueIdle();
+		renderManager_->StopThread();
+	}
+
 private:
 	Draw::DrawContext *draw_;
+	GLRenderManager *renderManager_ = nullptr;
+	SDL_Window *screen_;
+	SDL_GLContext glContext_;
 };
 
 void SDLHeadlessHost::LoadNativeAssets() {
@@ -75,7 +104,7 @@ void SDLHeadlessHost::LoadNativeAssets() {
 	VFSRegister("", new DirectoryAssetReader("../"));
 }
 
-bool SDLHeadlessHost::InitGraphics(std::string *error_message, GraphicsContext **ctx) {
+bool GLDummyGraphicsContext::InitFromRenderThread(std::string *errorMessage) {
 	SDL_Init(SDL_INIT_VIDEO);
 
 	// TODO
@@ -115,29 +144,72 @@ bool SDLHeadlessHost::InitGraphics(std::string *error_message, GraphicsContext *
 	}
 #endif
 
+	CheckGLExtensions();
+	draw_ = Draw::T3DCreateGLContext();
+	renderManager_ = (GLRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
+	SetGPUBackend(GPUBackend::OPENGL);
+	bool success = draw_->CreatePresets();
+	assert(success);
+	renderManager_->SetSwapFunction([&]() {
+		SDL_GL_SwapWindow(screen_);
+	});
+
+	return success;
+}
+
+bool SDLHeadlessHost::InitGraphics(std::string *error_message, GraphicsContext **ctx) {
 	GraphicsContext *graphicsContext = new GLDummyGraphicsContext();
 	*ctx = graphicsContext;
 	gfx_ = graphicsContext;
 
+	std::thread th([&]{
+		while (threadState_ == RenderThreadState::IDLE)
+			sleep_ms(1);
+		threadState_ = RenderThreadState::STARTING;
+
+		std::string err;
+		if (!gfx_->InitFromRenderThread(&err)) {
+			threadState_ = RenderThreadState::START_FAILED;
+			return;
+		}
+		gfx_->ThreadStart();
+		threadState_ = RenderThreadState::STARTED;
+
+		while (threadState_ != RenderThreadState::STOP_REQUESTED) {
+			if (!gfx_->ThreadFrame()) {
+				break;
+			}
+			gfx_->SwapBuffers();
+		}
+
+		threadState_ = RenderThreadState::STOPPING;
+		gfx_->ThreadEnd();
+		gfx_->ShutdownFromRenderThread();
+		threadState_ = RenderThreadState::STOPPED;
+	});
+	th.detach();
+
 	LoadNativeAssets();
 
-	return true;
+	threadState_ = RenderThreadState::START_REQUESTED;
+	while (threadState_ == RenderThreadState::START_REQUESTED || threadState_ == RenderThreadState::STARTING)
+		sleep_ms(1);
+
+	return threadState_ == RenderThreadState::STARTED;
 }
 
 void SDLHeadlessHost::ShutdownGraphics() {
+	gfx_->StopThread();
+	while (threadState_ != RenderThreadState::STOPPED)
+		sleep_ms(1);
+
 	gfx_->Shutdown();
 	delete gfx_;
 	gfx_ = nullptr;
-
-	SDL_GL_DeleteContext(glContext_);
-	glContext_ = nullptr;
-	SDL_DestroyWindow(screen_);
-	screen_ = nullptr;
 }
 
 void SDLHeadlessHost::SwapBuffers() {
 	gfx_->SwapBuffers();
-	SDL_GL_SwapWindow(screen_);
 }
 
 #endif
diff --git a/headless/SDLHeadlessHost.h b/headless/SDLHeadlessHost.h
index 9f50c8931f..daa0fe0413 100644
--- a/headless/SDLHeadlessHost.h
+++ b/headless/SDLHeadlessHost.h
@@ -38,9 +38,19 @@ public:
 protected:
 	void LoadNativeAssets();
 
-	SDL_Window *screen_;
-	SDL_GLContext glContext_;
+	enum class RenderThreadState {
+		IDLE,
+		START_REQUESTED,
+		STARTING,
+		START_FAILED,
+		STARTED,
+		STOP_REQUESTED,
+		STOPPING,
+		STOPPED,
+	};
+
 	GraphicsContext *gfx_;
+	volatile RenderThreadState threadState_ = RenderThreadState::IDLE;
 };
 
 #endif
diff --git a/headless/WindowsHeadlessHost.cpp b/headless/WindowsHeadlessHost.cpp
index 490ae92e8e..9bfe3d7832 100644
--- a/headless/WindowsHeadlessHost.cpp
+++ b/headless/WindowsHeadlessHost.cpp
@@ -32,6 +32,7 @@
 #include "Windows/GPU/WindowsVulkanContext.h"
 
 #include "base/logging.h"
+#include "base/timeutil.h"
 #include "gfx/gl_common.h"
 #include "gfx_es2/gpu_features.h"
 #include "file/vfs.h"
@@ -86,11 +87,13 @@ bool WindowsHeadlessHost::InitGraphics(std::string *error_message, GraphicsConte
 	}
 
 	WindowsGraphicsContext *graphicsContext = nullptr;
+	bool needRenderThread = false;
 	switch (gpuCore_) {
 	case GPUCORE_NULL:
 	case GPUCORE_GLES:
 	case GPUCORE_SOFTWARE:
 		graphicsContext = new WindowsGLContext();
+		needRenderThread = true;
 		break;
 
 	case GPUCORE_DIRECTX9:
@@ -116,17 +119,53 @@ bool WindowsHeadlessHost::InitGraphics(std::string *error_message, GraphicsConte
 		return false;
 	}
 
-	if (gpuCore_ == GPUCORE_GLES) {
-		// TODO: Do we need to do this here?
-		CheckGLExtensions();
+	if (needRenderThread) {
+		std::thread th([&]{
+			while (threadState_ == RenderThreadState::IDLE)
+				sleep_ms(1);
+			threadState_ = RenderThreadState::STARTING;
+
+			std::string err;
+			if (!gfx_->InitFromRenderThread(&err)) {
+				threadState_ = RenderThreadState::START_FAILED;
+				return;
+			}
+			gfx_->ThreadStart();
+			threadState_ = RenderThreadState::STARTED;
+
+			while (threadState_ != RenderThreadState::STOP_REQUESTED) {
+				if (!gfx_->ThreadFrame()) {
+					break;
+				}
+				gfx_->SwapBuffers();
+			}
+
+			threadState_ = RenderThreadState::STOPPING;
+			gfx_->ThreadEnd();
+			gfx_->ShutdownFromRenderThread();
+			threadState_ = RenderThreadState::STOPPED;
+		});
+		th.detach();
 	}
 
 	LoadNativeAssets();
 
+	if (needRenderThread) {
+		threadState_ = RenderThreadState::START_REQUESTED;
+		while (threadState_ == RenderThreadState::START_REQUESTED || threadState_ == RenderThreadState::STARTING)
+			sleep_ms(1);
+
+		return threadState_ == RenderThreadState::STARTED;
+	}
+
 	return true;
 }
 
 void WindowsHeadlessHost::ShutdownGraphics() {
+	gfx_->StopThread();
+	while (threadState_ != RenderThreadState::STOPPED)
+		sleep_ms(1);
+
 	gfx_->Shutdown();
 	delete gfx_;
 	gfx_ = nullptr;
diff --git a/headless/WindowsHeadlessHost.h b/headless/WindowsHeadlessHost.h
index 8a361ef41f..853eee1eb5 100644
--- a/headless/WindowsHeadlessHost.h
+++ b/headless/WindowsHeadlessHost.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "headless/StubHost.h"
+#include <thread>
 
 #undef HEADLESSHOST_CLASS
 #define HEADLESSHOST_CLASS WindowsHeadlessHost
@@ -38,8 +39,20 @@ public:
 protected:
 	void LoadNativeAssets();
 
+	enum class RenderThreadState {
+		IDLE,
+		START_REQUESTED,
+		STARTING,
+		START_FAILED,
+		STARTED,
+		STOP_REQUESTED,
+		STOPPING,
+		STOPPED,
+	};
+
 	HWND hWnd;
 	HDC hDC;
 	HGLRC hRC;
 	GraphicsContext *gfx_;
+	volatile RenderThreadState threadState_ = RenderThreadState::IDLE;
 };
diff --git a/libretro/.gitignore b/libretro/.gitignore
new file mode 100644
index 0000000000..b791c99ede
--- /dev/null
+++ b/libretro/.gitignore
@@ -0,0 +1,4 @@
+*.bc
+*.so
+*.dll
+*.dylib
diff --git a/libretro/CMakeLists.txt b/libretro/CMakeLists.txt
new file mode 100644
index 0000000000..b590cc25df
--- /dev/null
+++ b/libretro/CMakeLists.txt
@@ -0,0 +1,26 @@
+
+set(LIBRETRO_SRCS
+	libretro.cpp
+	LibretroGraphicsContext.cpp
+	LibretroGLContext.cpp
+	LibretroVulkanContext.cpp
+	libretro_vulkan.cpp)
+
+if(WIN32)
+	set(LIBRETRO_SRCS ${LIBRETRO_SRCS}
+		LibretroD3D11Context.cpp)
+endif()
+
+include_directories(libretro)
+
+add_library(ppsspp_libretro SHARED ${LIBRETRO_SRCS})
+set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}")
+set_target_properties(ppsspp_libretro PROPERTIES PREFIX "")
+if(ANDROID)
+	set_target_properties(ppsspp_libretro PROPERTIES SUFFIX "_android.so")
+endif()
+
+if(NOT MSVC)
+   target_link_libraries(ppsspp_libretro "-Wl,-Bsymbolic")
+endif()
+target_link_libraries(ppsspp_libretro ${LinkCommon})
diff --git a/libretro/LibretroD3D11Context.cpp b/libretro/LibretroD3D11Context.cpp
new file mode 100644
index 0000000000..7e6a939d7c
--- /dev/null
+++ b/libretro/LibretroD3D11Context.cpp
@@ -0,0 +1,95 @@
+
+#include "libretro/LibretroD3D11Context.h"
+#include "thin3d/d3d11_loader.h"
+#include <d3d11_1.h>
+
+#ifdef __MINGW32__
+#undef __uuidof
+#define __uuidof(type) IID_##type
+#endif
+
+bool LibretroD3D11Context::Init() {
+	if (!LibretroHWRenderContext::Init(true))
+		return false;
+
+	g_Config.iGPUBackend = (int)GPUBackend::DIRECT3D11;
+	return true;
+}
+
+void LibretroD3D11Context::CreateDrawContext() {
+	if (!Libretro::environ_cb(RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE, (void **)&d3d11_) || !d3d11_) {
+		ERROR_LOG(G3D, "Failed to get HW rendering interface!\n");
+		return;
+	}
+
+	if (d3d11_->interface_version != RETRO_HW_RENDER_INTERFACE_D3D11_VERSION) {
+		ERROR_LOG(G3D, "HW render interface mismatch, expected %u, got %u!\n", RETRO_HW_RENDER_INTERFACE_D3D11_VERSION, d3d11_->interface_version);
+		return;
+	}
+
+	ptr_D3DCompile = d3d11_->D3DCompile;
+
+	ID3D11Device1 *device1 = nullptr;
+	d3d11_->device->QueryInterface(__uuidof(ID3D11Device1), (void **)&device1);
+
+	ID3D11DeviceContext1 *context1 = nullptr;
+	d3d11_->context->QueryInterface(__uuidof(ID3D11DeviceContext1), (void **)&context1);
+
+	draw_ = Draw::T3DCreateD3D11Context(d3d11_->device, d3d11_->context, device1, context1, d3d11_->featureLevel, NULL);
+}
+
+void LibretroD3D11Context::DestroyDrawContext() {
+	LibretroHWRenderContext::DestroyDrawContext();
+	d3d11_ = nullptr;
+}
+
+void LibretroD3D11Context::GotBackbuffer() {
+	D3D11_TEXTURE2D_DESC desc{};
+	desc.Width = PSP_CoreParameter().pixelWidth;
+	desc.Height = PSP_CoreParameter().pixelHeight;
+	desc.MipLevels = 1;
+	desc.ArraySize = 1;
+	desc.Format = format_;
+	desc.SampleDesc.Count = 1;
+	desc.SampleDesc.Quality = 0;
+	desc.Usage = D3D11_USAGE_DEFAULT;
+	desc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
+	desc.CPUAccessFlags = 0;
+	desc.MiscFlags = 0;
+
+	if (SUCCEEDED(d3d11_->device->CreateTexture2D(&desc, nullptr, &texture_))) {
+		if (SUCCEEDED(d3d11_->device->CreateRenderTargetView(texture_, nullptr, &RTView_))) {
+			if (SUCCEEDED(d3d11_->device->CreateShaderResourceView(texture_, nullptr, &SRView_))) {
+				draw_->HandleEvent(Draw::Event::GOT_BACKBUFFER, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight, RTView_, texture_);
+				return;
+			}
+			RTView_->Release();
+			RTView_ = nullptr;
+		}
+		texture_->Release();
+		texture_ = nullptr;
+	}
+}
+
+void LibretroD3D11Context::LostBackbuffer() {
+	LibretroGraphicsContext::LostBackbuffer();
+	SRView_->Release();
+	SRView_ = nullptr;
+	RTView_->Release();
+	RTView_ = nullptr;
+	texture_->Release();
+	texture_ = nullptr;
+}
+
+void LibretroD3D11Context::SwapBuffers() {
+	ID3D11RenderTargetView *nullView = nullptr;
+	d3d11_->context->OMSetRenderTargets(1, &nullView, nullptr);
+
+	d3d11_->context->PSSetShaderResources(0, 1, &SRView_);
+	LibretroHWRenderContext::SwapBuffers();
+
+	ID3D11ShaderResourceView *nullSRV = nullptr;
+	d3d11_->context->PSSetShaderResources(0, 1, &nullSRV);
+
+	draw_->HandleEvent(Draw::Event::PRESENTED, 0, 0, nullptr, nullptr);
+}
diff --git a/libretro/LibretroD3D11Context.h b/libretro/LibretroD3D11Context.h
new file mode 100644
index 0000000000..8fa5c92b4e
--- /dev/null
+++ b/libretro/LibretroD3D11Context.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#define HAVE_D3D11
+#include "libretro/libretro_d3d.h"
+#include "libretro/LibretroGraphicsContext.h"
+
+class LibretroD3D11Context : public LibretroHWRenderContext {
+public:
+	LibretroD3D11Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_DIRECT3D, 11) {}
+	bool Init() override;
+
+	void SwapBuffers() override;
+	void GotBackbuffer() override;
+	void LostBackbuffer() override;
+	void CreateDrawContext() override;
+	void DestroyDrawContext() override;
+
+	GPUCore GetGPUCore() override { return GPUCORE_DIRECTX11; }
+	const char *Ident() override { return "DirectX 11"; }
+
+private:
+	retro_hw_render_interface_d3d11 *d3d11_ = nullptr;
+	ID3D11Texture2D *texture_ = nullptr;
+	ID3D11RenderTargetView *RTView_ = nullptr;
+	ID3D11ShaderResourceView *SRView_ = nullptr;
+	DXGI_FORMAT format_ = DXGI_FORMAT_R8G8B8A8_UNORM;
+};
diff --git a/libretro/LibretroGLContext.cpp b/libretro/LibretroGLContext.cpp
new file mode 100644
index 0000000000..c8a620c3cc
--- /dev/null
+++ b/libretro/LibretroGLContext.cpp
@@ -0,0 +1,35 @@
+
+#include "Common/Log.h"
+#include "Core/Config.h"
+#include "Core/System.h"
+#include "gfx_es2/gpu_features.h"
+
+#include "libretro/LibretroGLContext.h"
+
+bool LibretroGLContext::Init() {
+	if (!LibretroHWRenderContext::Init(true))
+		return false;
+
+	g_Config.iGPUBackend = (int)GPUBackend::OPENGL;
+	return true;
+}
+
+void LibretroGLContext::CreateDrawContext() {
+	if (!glewInitDone) {
+#if !defined(IOS) && !defined(USING_GLES2)
+		if (glewInit() != GLEW_OK) {
+			ERROR_LOG(G3D, "glewInit() failed.\n");
+			return;
+		}
+#endif
+		glewInitDone = true;
+		CheckGLExtensions();
+	}
+	draw_ = Draw::T3DCreateGLContext();
+	renderManager_ = (GLRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
+}
+
+void LibretroGLContext::DestroyDrawContext() {
+	LibretroHWRenderContext::DestroyDrawContext();
+	renderManager_ = nullptr;
+}
diff --git a/libretro/LibretroGLContext.h b/libretro/LibretroGLContext.h
new file mode 100644
index 0000000000..8751f1b25c
--- /dev/null
+++ b/libretro/LibretroGLContext.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "gfx/gl_common.h"
+#include "libretro/LibretroGraphicsContext.h"
+#include "thin3d/GLRenderManager.h"
+
+class LibretroGLContext : public LibretroHWRenderContext {
+public:
+	LibretroGLContext()
+#ifdef USING_GLES2
+		: HWRenderContext(RETRO_HW_CONTEXT_OPENGLES2)
+#elif defined(HAVE_OPENGL_CORE)
+		: HWRenderContext(RETRO_HW_CONTEXT_OPENGL_CORE, 3, 1)
+#else
+		: LibretroHWRenderContext(RETRO_HW_CONTEXT_OPENGL)
+#endif
+	{
+		hw_render_.bottom_left_origin = true;
+	}
+
+	bool Init() override;
+	void CreateDrawContext() override;
+	void DestroyDrawContext() override;
+	void SetRenderTarget() override {
+		extern GLuint g_defaultFBO;
+		g_defaultFBO = hw_render_.get_current_framebuffer();
+	}
+
+	void ThreadStart() override { renderManager_->ThreadStart(); }
+	bool ThreadFrame() override { return renderManager_->ThreadFrame(); }
+	void ThreadEnd() override { renderManager_->ThreadEnd(); }
+	void StopThread() override {
+		renderManager_->WaitUntilQueueIdle();
+		renderManager_->StopThread();
+	}
+
+	GPUCore GetGPUCore() override { return GPUCORE_GLES; }
+	const char *Ident() override { return "OpenGL"; }
+
+private:
+	GLRenderManager *renderManager_ = nullptr;
+	bool glewInitDone = false;
+};
diff --git a/libretro/LibretroGraphicsContext.cpp b/libretro/LibretroGraphicsContext.cpp
new file mode 100644
index 0000000000..08d7cdbac9
--- /dev/null
+++ b/libretro/LibretroGraphicsContext.cpp
@@ -0,0 +1,129 @@
+
+#include "libretro/LibretroGraphicsContext.h"
+#include "libretro/LibretroGLContext.h"
+#include "libretro/libretro.h"
+#ifndef NO_VULKAN
+#include "libretro/LibretroVulkanContext.h"
+#endif
+#ifdef _WIN32
+#include "libretro/LibretroD3D11Context.h"
+#endif
+
+#include "Common/Log.h"
+#include "Core/Config.h"
+#include "Core/System.h"
+#include "GPU/GPUInterface.h"
+
+retro_video_refresh_t LibretroGraphicsContext::video_cb;
+
+void retro_set_video_refresh(retro_video_refresh_t cb) { LibretroGraphicsContext::video_cb = cb; }
+static void context_reset() { ((LibretroHWRenderContext *)Libretro::ctx)->ContextReset(); }
+static void context_destroy() { ((LibretroHWRenderContext *)Libretro::ctx)->ContextDestroy(); }
+
+bool LibretroHWRenderContext::Init(bool cache_context) {
+	hw_render_.cache_context = cache_context;
+	return Libretro::environ_cb(RETRO_ENVIRONMENT_SET_HW_RENDER, &hw_render_);
+}
+
+LibretroHWRenderContext::LibretroHWRenderContext(retro_hw_context_type context_type, unsigned version_major, unsigned version_minor) {
+	hw_render_.context_type = context_type;
+	hw_render_.version_major = version_major;
+	hw_render_.version_minor = version_minor;
+	hw_render_.context_reset = context_reset;
+	hw_render_.context_destroy = context_destroy;
+	hw_render_.depth = true;
+}
+
+void LibretroHWRenderContext::ContextReset() {
+	INFO_LOG(G3D, "Context reset");
+
+	// needed to restart the thread
+	// TODO: find a way to move this to ContextDestroy.
+	if (!hw_render_.cache_context && Libretro::useEmuThread && draw_ && Libretro::emuThreadState != Libretro::EmuThreadState::PAUSED) {
+		DestroyDrawContext();
+	}
+
+	if (!draw_) {
+		CreateDrawContext();
+		PSP_CoreParameter().thin3d = draw_;
+		bool success = draw_->CreatePresets();
+		assert(success);
+	}
+
+	GotBackbuffer();
+
+	if (gpu) {
+		gpu->DeviceRestore();
+	}
+}
+
+void LibretroHWRenderContext::ContextDestroy() {
+	INFO_LOG(G3D, "Context destroy");
+
+	if (Libretro::useEmuThread) {
+#if 0
+		Libretro::EmuThreadPause();
+#else
+		Libretro::EmuThreadStop();
+#endif
+	}
+
+	LostBackbuffer();
+
+	gpu->DeviceLost();
+
+	if (!hw_render_.cache_context && !Libretro::useEmuThread) {
+		Shutdown();
+	}
+}
+
+void LibretroGraphicsContext::GotBackbuffer() { draw_->HandleEvent(Draw::Event::GOT_BACKBUFFER, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight); }
+
+void LibretroGraphicsContext::LostBackbuffer() { draw_->HandleEvent(Draw::Event::LOST_BACKBUFFER, -1, -1); }
+
+LibretroGraphicsContext *LibretroGraphicsContext::CreateGraphicsContext() {
+	LibretroGraphicsContext *ctx;
+
+	ctx = new LibretroGLContext();
+
+	if (ctx->Init()) {
+		return ctx;
+	}
+	delete ctx;
+
+#ifndef NO_VULKAN
+	ctx = new LibretroVulkanContext();
+
+	if (ctx->Init()) {
+		return ctx;
+	}
+	delete ctx;
+#endif
+
+#ifdef _WIN32
+	ctx = new LibretroD3D11Context();
+
+	if (ctx->Init()) {
+		return ctx;
+	}
+	delete ctx;
+
+	ctx = new LibretroD3D9Context();
+
+	if (ctx->Init()) {
+		return ctx;
+	}
+	delete ctx;
+#endif
+
+#if 1
+	ctx = new LibretroSoftwareContext();
+
+	if (ctx->Init()) {
+		return ctx;
+	}
+	delete ctx;
+#endif
+
+	return new LibretroNullContext();
+}
diff --git a/libretro/LibretroGraphicsContext.h b/libretro/LibretroGraphicsContext.h
new file mode 100644
index 0000000000..c816fda376
--- /dev/null
+++ b/libretro/LibretroGraphicsContext.h
@@ -0,0 +1,121 @@
+#pragma once
+#include <atomic>
+
+#include "libretro/libretro.h"
+#include "Common/GraphicsContext.h"
+#include "thin3d/thin3d_create.h"
+
+#include "Core/System.h"
+#include "GPU/GPUState.h"
+
+class LibretroGraphicsContext : public GraphicsContext {
+public:
+	LibretroGraphicsContext() {}
+	~LibretroGraphicsContext() override { Shutdown(); }
+
+	virtual bool Init() = 0;
+	virtual void SetRenderTarget() {}
+	virtual GPUCore GetGPUCore() = 0;
+	virtual const char *Ident() = 0;
+
+	void Shutdown() override {
+		DestroyDrawContext();
+		PSP_CoreParameter().thin3d = nullptr;
+	}
+	void SwapInterval(int interval) override {}
+	void Resize() override {}
+
+	virtual void GotBackbuffer();
+	virtual void LostBackbuffer();
+
+	virtual void CreateDrawContext() {}
+	virtual void DestroyDrawContext() {
+		if (!draw_) {
+			return;
+		}
+		delete draw_;
+		draw_ = nullptr;
+	}
+	Draw::DrawContext *GetDrawContext() override { return draw_; }
+
+	static LibretroGraphicsContext *CreateGraphicsContext();
+
+	static retro_video_refresh_t video_cb;
+
+protected:
+	Draw::DrawContext *draw_ = nullptr;
+};
+
+class LibretroHWRenderContext : public LibretroGraphicsContext {
+public:
+	LibretroHWRenderContext(retro_hw_context_type context_type, unsigned version_major = 0, unsigned version_minor = 0);
+	bool Init(bool cache_context);
+	void SetRenderTarget() override {}
+	void SwapBuffers() override {
+		if (gstate_c.skipDrawReason) {
+			video_cb(NULL, 0, 0, 0);
+		} else {
+			video_cb(RETRO_HW_FRAME_BUFFER_VALID, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight, 0);
+		}
+	}
+	virtual void ContextReset();
+	virtual void ContextDestroy();
+
+protected:
+	retro_hw_render_callback hw_render_ = {};
+};
+
+#ifdef _WIN32
+class LibretroD3D9Context : public LibretroHWRenderContext {
+public:
+	LibretroD3D9Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_DIRECT3D, 9) {}
+	bool Init() override { return false; }
+
+	void CreateDrawContext() override {
+		draw_ = Draw::T3DCreateDX9Context(nullptr, nullptr, 0, nullptr, nullptr);
+		draw_->CreatePresets();
+	}
+
+	GPUCore GetGPUCore() override { return GPUCORE_DIRECTX9; }
+	const char *Ident() override { return "DirectX 9"; }
+};
+#endif
+
+class LibretroSoftwareContext : public LibretroGraphicsContext {
+public:
+	LibretroSoftwareContext() {}
+	bool Init() override { return true; }
+	void SwapBuffers() override { video_cb(NULL, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight, 0); }
+	GPUCore GetGPUCore() override { return GPUCORE_SOFTWARE; }
+	const char *Ident() override { return "Software"; }
+};
+
+class LibretroNullContext : public LibretroGraphicsContext {
+public:
+	LibretroNullContext() {}
+
+	bool Init() override { return true; }
+	void SwapBuffers() override { video_cb(NULL, 0, 0, 0); }
+	GPUCore GetGPUCore() override { return GPUCORE_NULL; }
+	const char *Ident() override { return "NULL"; }
+};
+
+namespace Libretro {
+extern LibretroGraphicsContext *ctx;
+extern retro_environment_t environ_cb;
+
+enum class EmuThreadState {
+	DISABLED,
+	START_REQUESTED,
+	RUNNING,
+	PAUSE_REQUESTED,
+	PAUSED,
+	QUIT_REQUESTED,
+	STOPPED,
+};
+extern bool useEmuThread;
+extern std::atomic<EmuThreadState> emuThreadState;
+void EmuThreadStart();
+void EmuThreadStop();
+void EmuThreadPause();
+} // namespace Libretro
diff --git a/libretro/LibretroVulkanContext.cpp b/libretro/LibretroVulkanContext.cpp
new file mode 100644
index 0000000000..7530fd6916
--- /dev/null
+++ b/libretro/LibretroVulkanContext.cpp
@@ -0,0 +1,143 @@
+
+#include "Common/Vulkan/VulkanLoader.h"
+#include "Common/Vulkan/VulkanContext.h"
+#include "Common/Vulkan/VulkanDebug.h"
+#include "Common/Log.h"
+#include "Core/Config.h"
+#include "Core/System.h"
+#include "GPU/GPUInterface.h"
+#include "util/text/parsers.h"
+
+#include "libretro/LibretroVulkanContext.h"
+#include "libretro/libretro_vulkan.h"
+
+static VulkanContext *vk;
+
+void vk_libretro_init(VkInstance instance, VkPhysicalDevice gpu, VkSurfaceKHR surface, PFN_vkGetInstanceProcAddr get_instance_proc_addr, const char **required_device_extensions, unsigned num_required_device_extensions, const char **required_device_layers, unsigned num_required_device_layers, const VkPhysicalDeviceFeatures *required_features);
+void vk_libretro_shutdown();
+void vk_libretro_set_hwrender_interface(retro_hw_render_interface *hw_render_interface);
+void vk_libretro_wait_for_presentation();
+
+LibretroVulkanContext::LibretroVulkanContext()
+	: LibretroHWRenderContext(RETRO_HW_CONTEXT_VULKAN, VK_MAKE_VERSION(1, 0, 18)) {}
+
+void LibretroVulkanContext::SwapBuffers() {
+	vk_libretro_wait_for_presentation();
+	LibretroHWRenderContext::SwapBuffers();
+}
+
+static bool create_device(retro_vulkan_context *context, VkInstance instance, VkPhysicalDevice gpu, VkSurfaceKHR surface, PFN_vkGetInstanceProcAddr get_instance_proc_addr, const char **required_device_extensions, unsigned num_required_device_extensions, const char **required_device_layers, unsigned num_required_device_layers, const VkPhysicalDeviceFeatures *required_features) {
+	init_glslang();
+
+	vk = new VulkanContext;
+	if (!vk->InitError().empty()) {
+		ERROR_LOG(G3D, "%s", vk->InitError().c_str());
+		return false;
+	}
+
+	vk_libretro_init(instance, gpu, surface, get_instance_proc_addr, required_device_extensions, num_required_device_extensions, required_device_layers, num_required_device_layers, required_features);
+
+	vk->CreateInstance({});
+
+	int physical_device = 0;
+	while (gpu && vk->GetPhysicalDevice(physical_device) != gpu) {
+		physical_device++;
+	}
+
+	if (!gpu) {
+		physical_device = vk->GetBestPhysicalDevice();
+	}
+
+	vk->ChooseDevice(physical_device);
+	vk->CreateDevice();
+#ifdef _WIN32
+	vk->InitSurface(WINDOWSYSTEM_WIN32, nullptr, nullptr);
+#elif defined(__ANDROID__)
+	vk->InitSurface(WINDOWSYSTEM_ANDROID, nullptr, nullptr);
+#elif defined(VK_USE_PLATFORM_XLIB_KHR)
+	vk->InitSurface(WINDOWSYSTEM_XLIB, nullptr, nullptr);
+#elif defined(VK_USE_PLATFORM_XCB_KHR)
+	vk->InitSurface(WINDOWSYSTEM_XCB, nullptr, nullptr);
+#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
+	vk->InitSurface(WINDOWSYSTEM_WAYLAND, nullptr, nullptr);
+#endif
+
+	if (!vk->InitQueue()) {
+		return false;
+	}
+
+	context->gpu = vk->GetPhysicalDevice(physical_device);
+	context->device = vk->GetDevice();
+	context->queue = vk->GetGraphicsQueue();
+	context->queue_family_index = vk->GetGraphicsQueueFamilyIndex();
+	context->presentation_queue = context->queue;
+	context->presentation_queue_family_index = context->queue_family_index;
+#ifdef _DEBUG
+	fflush(stdout);
+#endif
+	return true;
+}
+
+static const VkApplicationInfo *GetApplicationInfo(void) {
+	static VkApplicationInfo app_info{ VK_STRUCTURE_TYPE_APPLICATION_INFO };
+	app_info.pApplicationName = "PPSSPP";
+	app_info.applicationVersion = Version(PPSSPP_GIT_VERSION).ToInteger();
+	app_info.pEngineName = "PPSSPP";
+	app_info.engineVersion = 2;
+	app_info.apiVersion = VK_API_VERSION_1_0;
+	return &app_info;
+}
+
+bool LibretroVulkanContext::Init() {
+	if (!LibretroHWRenderContext::Init(false)) {
+		return false;
+	}
+
+	static const struct retro_hw_render_context_negotiation_interface_vulkan iface = { RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN, RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN_VERSION, GetApplicationInfo, create_device, nullptr };
+	Libretro::environ_cb(RETRO_ENVIRONMENT_SET_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE, (void *)&iface);
+
+	g_Config.iGPUBackend = (int)GPUBackend::VULKAN;
+	return true;
+}
+
+void LibretroVulkanContext::Shutdown() {
+	LibretroHWRenderContext::Shutdown();
+
+	if (!vk) {
+		return;
+	}
+
+	vk->WaitUntilQueueIdle();
+
+	vk->DestroyObjects();
+	vk->DestroyDevice();
+	vk->DestroyInstance();
+	delete vk;
+	vk = nullptr;
+
+	finalize_glslang();
+	vk_libretro_shutdown();
+}
+
+void *LibretroVulkanContext::GetAPIContext() { return vk; }
+
+void LibretroVulkanContext::CreateDrawContext() {
+	retro_hw_render_interface *vulkan;
+	if (!Libretro::environ_cb(RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE, (void **)&vulkan) || !vulkan) {
+		ERROR_LOG(G3D, "Failed to get HW rendering interface!\n");
+		return;
+	}
+	if (vulkan->interface_version != RETRO_HW_RENDER_INTERFACE_VULKAN_VERSION) {
+		ERROR_LOG(G3D, "HW render interface mismatch, expected %u, got %u!\n", RETRO_HW_RENDER_INTERFACE_VULKAN_VERSION, vulkan->interface_version);
+		return;
+	}
+	vk_libretro_set_hwrender_interface(vulkan);
+
+	vk->ReinitSurface(PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
+
+	if (!vk->InitSwapchain()) {
+		return;
+	}
+
+	draw_ = Draw::T3DCreateVulkanContext(vk, false);
+}
diff --git a/libretro/LibretroVulkanContext.h b/libretro/LibretroVulkanContext.h
new file mode 100644
index 0000000000..e7386a43d0
--- /dev/null
+++ b/libretro/LibretroVulkanContext.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "libretro/LibretroGraphicsContext.h"
+
+class LibretroVulkanContext : public LibretroHWRenderContext {
+public:
+	LibretroVulkanContext();
+	~LibretroVulkanContext() override {}
+	bool Init() override;
+	void Shutdown() override;
+	void SwapBuffers() override;
+
+	void *GetAPIContext() override;
+	void CreateDrawContext() override;
+	GPUCore GetGPUCore() override { return GPUCORE_VULKAN; }
+	const char *Ident() override { return "Vulkan"; }
+};
diff --git a/libretro/Makefile b/libretro/Makefile
new file mode 100644
index 0000000000..4fdb2ea929
--- /dev/null
+++ b/libretro/Makefile
@@ -0,0 +1,453 @@
+DEBUG=0
+WITH_DYNAREC := 1
+
+DYNAFLAGS :=
+INCFLAGS  := -I.
+COREFLAGS :=
+CPUFLAGS  :=
+
+UNAME=$(shell uname -a)
+
+# Cross compile ?
+
+ifeq (,$(TARGET_ARCH))
+	TARGET_ARCH = $(shell uname -m)
+endif
+
+ifneq (,$(findstring 64,$(TARGET_ARCH)))
+   override TARGET_ARCH := x86_64
+else ifneq (,$(findstring 86,$(TARGET_ARCH)))
+   override TARGET_ARCH := x86
+endif
+
+ifeq ($(platform),)
+	platform = unix
+	ifeq ($(UNAME),)
+		platform = win
+	else ifneq ($(findstring MINGW,$(UNAME)),)
+		platform = win
+	else ifneq ($(findstring Darwin,$(UNAME)),)
+		platform = osx
+		LDFLAGS += -lm
+	else ifneq ($(findstring win,$(UNAME)),)
+		platform = win
+	endif
+endif
+
+ifeq ($(platform), unix)
+LDFLAGS += -lm
+endif
+
+# Dirs
+CORE_DIR			= ..
+FFMPEGDIR		= $(CORE_DIR)/ffmpeg
+LIBRETRODIR		= $(CORE_DIR)/libretro
+COREDIR			= $(CORE_DIR)/Core
+COMMONDIR		= $(CORE_DIR)/Common
+GPUCOMMONDIR	= $(CORE_DIR)/GPU/Common
+GPUDIR			= $(CORE_DIR)/GPU
+NATIVEDIR		= $(CORE_DIR)/native
+EXTDIR			= $(CORE_DIR)/ext
+
+TARGET_NAME := ppsspp
+
+FFMPEGINCFLAGS :=
+FFMPEGLIBDIR :=
+FFMPEGLIBS :=
+
+# Unix
+ifneq (,$(findstring unix,$(platform)))
+	TARGET := $(TARGET_NAME)_libretro.so
+	LDFLAGS += -shared -Wl,--version-script=link.T -Wl,--no-undefined
+
+	FFMPEGINCFLAGS += -I$(FFMPEGDIR)/linux/$(TARGET_ARCH)/include
+	FFMPEGLIBDIR := $(FFMPEGDIR)/linux/$(TARGET_ARCH)/lib
+	FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
+	fpic = -fPIC
+	ifneq (,$(findstring gles,$(platform)))
+		GLES = 1
+		GL_LIB := -lGLESv2
+	else
+		GL_LIB := -lGL
+	endif
+	PLATFORM_EXT := unix
+	LDFLAGS += -lrt -ldl
+
+# Raspberry Pi
+else ifneq (,$(findstring rpi,$(platform)))
+	TARGET := $(TARGET_NAME)_libretro.so
+	LDFLAGS += -shared -Wl,--version-script=link.T
+	fpic = -fPIC
+	GLES = 1
+	GL_LIB := -lGLESv2
+	INCFLAGS += -I/opt/vc/include
+	CPUFLAGS += -DARMv5_ONLY 
+	PLATFORM_EXT := unix
+	TARGET_ARCH = arm
+	LDFLAGS += -lrt -ldl
+
+# i.MX6
+else ifneq (,$(findstring imx6,$(platform)))
+	TARGET := $(TARGET_NAME)_libretro.so
+	LDFLAGS += -shared -Wl,--version-script=link.T
+	fpic = -fPIC
+	GLES = 1
+	GL_LIB := -lGLESv2
+	CPUFLAGS += 
+	PLATFORM_EXT := unix
+	TARGET_ARCH = arm
+	HAVE_NEON=1
+	FFMPEGINCFLAGS += -I$(FFMPEGDIR)/linux/$(TARGET_ARCH)/include
+	FFMPEGLIBDIR := $(FFMPEGDIR)/linux/$(TARGET_ARCH)/lib
+	FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
+	LDFLAGS += -lrt -ldl
+
+# OS X
+else ifneq (,$(findstring osx,$(platform)))
+	TARGET := $(TARGET_NAME)_libretro.dylib
+	LDFLAGS += -dynamiclib
+	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
+	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9 )) && echo "YES"`
+	ifeq ($(OSX_LT_MAVERICKS),"YES")
+		LDFLAGS += -mmacosx-version-min=10.5
+	endif
+		LDFLAGS += -stdlib=libc++
+	fpic = -fPIC
+
+	FFMPEGINCFLAGS += -I$(FFMPEGDIR)/macosx/$(TARGET_ARCH)/include
+	FFMPEGLIBDIR := $(FFMPEGDIR)/macosx/$(TARGET_ARCH)/lib
+	FFMPEGLDFLAGS += -liconv -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
+	PLATCFLAGS += -D__MACOSX__
+	GL_LIB := -framework OpenGL
+	PLATFORM_EXT := darwin
+
+# iOS
+else ifneq (,$(findstring ios,$(platform)))
+	TARGET := $(TARGET_NAME)_libretro_ios.dylib
+	PLATCFLAGS += -DIOS
+	LDFLAGS += -dynamiclib -marm
+	fpic = -fPIC
+	GLES = 1
+	GL_LIB := -framework OpenGLES
+	HAVE_NEON = 1
+
+	FFMPEGINCFLAGS += -I$(FFMPEGDIR)/ios/universal/include
+	FFMPEGLIBDIR := $(FFMPEGDIR)/ios/universal/lib
+	FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
+
+	ifeq ($(IOSSDK),)
+		IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
+	endif
+
+	CC = clang -arch armv7 -isysroot $(IOSSDK)
+	CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
+	OSXVER = `sw_vers -productVersion | cut -c 4`
+	ifneq ($(OSXVER),9)
+		CC += -miphoneos-version-min=5.0
+		AS += -miphoneos-version-min=5.0
+		CXX += -miphoneos-version-min=5.0
+		PLATCFLAGS += -miphoneos-version-min=5.0
+	endif
+	PLATCFLAGS += -DIOS -DHAVE_POSIX_MEMALIGN
+	CPUFLAGS += -DARMv5_ONLY -DARM
+	PLATFORM_EXT := unix
+	TARGET_ARCH = arm
+
+# Android
+else ifneq (,$(findstring android,$(platform)))
+	fpic = -fPIC
+	TARGET := $(TARGET_NAME)_libretro_android.so
+	LDFLAGS += -shared -Wl,--version-script=link.T -Wl,--no-undefined -Wl,--warn-common
+	GL_LIB := -lGLESv2
+
+	CC = arm-linux-androideabi-gcc
+	CXX = arm-linux-androideabi-g++
+	TARGET_ARCH = arm
+	GLES = 1
+	PLATCFLAGS += -DANDROID 
+	CPUCFLAGS  += 
+	HAVE_NEON = 1
+	CPUFLAGS += -marm -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -D__arm__ -DARM_ASM -D__NEON_OPT
+	CFLAGS += -DANDROID
+	LDFLAGS += -llog -lGLESv2 -lEGL
+
+	FFMPEGINCFLAGS += -I$(FFMPEGDIR)/android/armv7/include
+	FFMPEGLIBDIR := $(FFMPEGDIR)/android/armv7/lib
+	FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
+
+	PLATFORM_EXT := android
+
+# QNX
+else ifeq ($(platform), qnx)
+	fpic = -fPIC
+	TARGET := $(TARGET_NAME)_libretro_qnx.so
+	LDFLAGS += -shared -Wl,--version-script=link.T -Wl,--no-undefined -Wl,--warn-common
+	GL_LIB := -lGLESv2
+
+	CC = qcc -Vgcc_ntoarmv7le
+	AS = qcc -Vgcc_ntoarmv7le
+	CXX = QCC -Vgcc_ntoarmv7le
+	AR = QCC -Vgcc_ntoarmv7le
+	TARGET_ARCH = arm
+	GLES = 1
+	PLATCFLAGS += -D__BLACKBERRY_QNX__
+	HAVE_NEON = 1
+	CPUFLAGS += -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp -D__arm__ -DARM_ASM -D__NEON_OPT
+	CFLAGS += -D__QNX__
+
+	PLATFORM_EXT := unix
+
+# ARM
+else ifneq (,$(findstring armv,$(platform)))
+	TARGET := $(TARGET_NAME)_libretro.so
+	TARGET_ARCH = armv7
+	fpic := -fPIC
+	LDFLAGS += -shared -Wl,--version-script=link.T -Wl,--no-undefined
+	FFMPEGINCFLAGS += -I$(FFMPEGDIR)/linux/$(TARGET_ARCH)/include
+	FFMPEGLIBDIR := $(FFMPEGDIR)/linux/$(TARGET_ARCH)/lib
+	FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
+	INCFLAGS += -I.
+	ifneq (,$(findstring gles,$(platform)))
+		GLES := 1
+		GL_LIB := -lGLESv2 -lEGL
+		LDFLAGS += -lGLESv2 -lEGL
+	else
+		GL_LIB := -lGL
+	endif
+	ifneq (,$(findstring cortexa8,$(platform)))
+		CPUFLAGS += -marm -mcpu=cortex-a8
+	else ifneq (,$(findstring cortexa9,$(platform)))
+		CPUFLAGS += -marm -mcpu=cortex-a9
+	endif
+		CPUFLAGS += -marm
+	ifneq (,$(findstring neon,$(platform)))
+		CPUFLAGS += -mfpu=neon -D__NEON_OPT
+		HAVE_NEON = 1
+	endif
+	ifneq (,$(findstring softfloat,$(platform)))
+		CPUFLAGS += -mfloat-abi=softfp
+	else ifneq (,$(findstring hardfloat,$(platform)))
+		CPUFLAGS += -mfloat-abi=hard
+	endif
+	CPUFLAGS += -D__arm__ -DARM_ASM
+	PLATCFLAGS += -DARM
+	LDFLAGS += -lrt -ldl
+
+# emscripten
+else ifeq ($(platform), emscripten)
+	TARGET := $(TARGET_NAME)_libretro_emscripten.bc
+	GLES := 1
+	CPUFLAGS += 
+	PLATCFLAGS += -DCC_resampler=mupen_CC_resampler -Dsinc_resampler=mupen_sinc_resampler \
+					-Drglgen_symbol_map=mupen_rglgen_symbol_map -Dmain_exit=mupen_main_exit \
+					-Dadler32=mupen_adler32 -Drarch_resampler_realloc=mupen_rarch_resampler_realloc \
+					-Daudio_convert_s16_to_float_C=mupen_audio_convert_s16_to_float_C -Daudio_convert_float_to_s16_C=mupen_audio_convert_float_to_s16_C \
+					-Daudio_convert_init_simd=mupen_audio_convert_init_simd -Drglgen_resolve_symbols_custom=mupen_rglgen_resolve_symbols_custom \
+					-Drglgen_resolve_symbols=mupen_rglgen_resolve_symbols
+	PLATFORM_EXT := unix
+
+# Windows MSVC 2017 all architectures
+else ifneq (,$(findstring windows_msvc2017,$(platform)))
+
+	PlatformSuffix = $(subst windows_msvc2017_,,$(platform))
+	ifneq (,$(findstring desktop,$(PlatformSuffix)))
+		WinPartition = desktop
+		MSVC2017CompileFlags = -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_UNICODE -DUNICODE -DWINVER=0x0501 -D_WIN32_WINNT=0x0501
+		LDFLAGS += -MANIFEST -NXCOMPAT -DYNAMICBASE -DEBUG -OPT:REF -INCREMENTAL:NO -SUBSYSTEM:WINDOWS -MANIFESTUAC:"level='asInvoker' uiAccess='false'" -OPT:ICF -ERRORREPORT:PROMPT -NOLOGO -TLBID:1
+		LIBS += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
+	else ifneq (,$(findstring uwp,$(PlatformSuffix)))
+		WinPartition = uwp
+		MSVC2017CompileFlags = -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DWINDLL -D_UNICODE -DUNICODE -DWRL_NO_DEFAULT_LIB
+		LDFLAGS += -APPCONTAINER -NXCOMPAT -DYNAMICBASE -MANIFEST:NO -OPT:REF -SUBSYSTEM:CONSOLE -MANIFESTUAC:NO -OPT:ICF -ERRORREPORT:PROMPT -NOLOGO -TLBID:1 -DEBUG:FULL -WINMD:NO
+		LIBS += WindowsApp.lib
+	endif
+
+	CFLAGS += $(MSVC2017CompileFlags) -nologo
+	CXXFLAGS += $(MSVC2017CompileFlags) -nologo -EHsc
+
+	TargetArchMoniker = $(subst $(WinPartition)_,,$(PlatformSuffix))
+
+	CC  = cl.exe
+	CXX = cl.exe
+
+	SPACE :=
+	SPACE := $(SPACE) $(SPACE)
+	BACKSLASH :=
+	BACKSLASH := \$(BACKSLASH)
+	filter_out1 = $(filter-out $(firstword $1),$1)
+	filter_out2 = $(call filter_out1,$(call filter_out1,$1))
+
+	reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul)))
+	fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1))
+
+	b1 := (
+	b2 := )
+	ProgramFiles86w := $(ProgramFiles$(b1)x86$(b2))
+	ProgramFiles86 := $(shell cygpath "$(ProgramFiles86w)")
+
+	WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
+	WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_CURRENT_USER\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
+	WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0)
+	WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_CURRENT_USER\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0)
+	WindowsSdkDir := $(WindowsSdkDir)
+
+	WindowsSDKVersion ?= $(firstword $(foreach folder,$(subst $(subst \,/,$(WindowsSdkDir)Include/),,$(wildcard $(call fix_path,$(WindowsSdkDir)Include\*))),$(if $(wildcard $(call fix_path,$(WindowsSdkDir)Include/$(folder)/um/Windows.h)),$(folder),)))$(BACKSLASH)
+	WindowsSDKVersion := $(WindowsSDKVersion)
+
+	VsInstallBuildTools = $(ProgramFiles86)/Microsoft Visual Studio/2017/BuildTools
+	VsInstallEnterprise = $(ProgramFiles86)/Microsoft Visual Studio/2017/Enterprise
+	VsInstallProfessional = $(ProgramFiles86)/Microsoft Visual Studio/2017/Professional
+	VsInstallCommunity = $(ProgramFiles86)/Microsoft Visual Studio/2017/Community
+
+	VsInstallRoot ?= $(shell if [ -d "$(VsInstallBuildTools)" ]; then echo "$(VsInstallBuildTools)"; fi)
+	ifeq ($(VsInstallRoot), )
+		VsInstallRoot = $(shell if [ -d "$(VsInstallEnterprise)" ]; then echo "$(VsInstallEnterprise)"; fi)
+	endif
+	ifeq ($(VsInstallRoot), )
+		VsInstallRoot = $(shell if [ -d "$(VsInstallProfessional)" ]; then echo "$(VsInstallProfessional)"; fi)
+	endif
+	ifeq ($(VsInstallRoot), )
+		VsInstallRoot = $(shell if [ -d "$(VsInstallCommunity)" ]; then echo "$(VsInstallCommunity)"; fi)
+	endif
+	VsInstallRoot := $(VsInstallRoot)
+
+	VcCompilerToolsVer := $(shell cat "$(VsInstallRoot)/VC/Auxiliary/Build/Microsoft.VCToolsVersion.default.txt" | grep -o '[0-9\.]*')
+	VcCompilerToolsDir := $(VsInstallRoot)/VC/Tools/MSVC/$(VcCompilerToolsVer)
+	VcCompilerLibDir := $(VcCompilerToolsDir)/lib/$(TargetArchMoniker)
+
+	WindowsSDKSharedIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\shared")
+	WindowsSDKUCRTIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\ucrt")
+	WindowsSDKUMIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\um")
+	WindowsSDKUCRTLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\$(WindowsSDKVersion)\ucrt\$(TargetArchMoniker)")
+	WindowsSDKUMLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\$(WindowsSDKVersion)\um\$(TargetArchMoniker)")
+
+	LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerLibDir)")
+	INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/include")
+
+	# For some reason the HostX86 compiler doesn't like compiling for x64
+	# ("no such file" opening a shared library), and vice-versa.
+	# Work around it for now by using the strictly x86 compiler for x86, and x64 for x64.
+	# NOTE: What about ARM?
+	ifneq (,$(findstring x64,$(TargetArchMoniker)))
+		override TARGET_ARCH = x86_64
+		VCCompilerToolsBinDir := $(VcCompilerToolsDir)/bin/HostX64/$(TargetArchMoniker)
+      LIB := $(LIB);$(CORE_DIR)/dx9sdk/Lib/x64
+	else
+		override TARGET_ARCH = x86
+		VCCompilerToolsBinDir := $(VcCompilerToolsDir)/bin/HostX86/$(TargetArchMoniker)
+      LIB := $(LIB);$(CORE_DIR)/dx9sdk/Lib/x86
+	endif
+
+	PATH := $(shell IFS=$$'\n'; cygpath "$(VCCompilerToolsBinDir)"):$(PATH)
+	PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VsInstallRoot)/Common7/IDE")
+
+	export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir)
+	export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir);$(FFMPEGDIR)/Windows/$(TARGET_ARCH)/lib
+	TARGET := $(TARGET_NAME)_libretro.dll
+	PSS_STYLE :=2
+	LDFLAGS += -DLL
+	PLATFORM_EXT := win32
+	FFMPEGINCFLAGS += -I$(FFMPEGDIR)/Windows/$(TARGET_ARCH)/include
+	FFMPEGLIBDIR := $(FFMPEGDIR)/Windows/$(TARGET_ARCH)/lib
+	FFMPEGLDFLAGS += -LIBPATH:$(FFMPEGLIBDIR)
+	GL_LIB := opengl32.lib
+	LDFLAGS += ws2_32.lib user32.lib shell32.lib avcodec.lib avutil.lib swresample.lib swscale.lib avformat.lib advapi32.lib winmm.lib gdi32.lib d3d9.lib d3dx9.lib
+
+# Windows
+else ifneq (,$(findstring win,$(platform)))   
+	TARGET := $(TARGET_NAME)_libretro.dll
+	CFLAGS += -D_UNICODE -DUNICODE
+	CXXFLAGS += -fpermissive -Wno-multichar -D_UNICODE -DUNICODE
+	LDFLAGS += -shared -Wl,--no-undefined -static-libgcc -static-libstdc++ -Wl,--version-script=link.T -lwinmm -lgdi32 -lwsock32 -lws2_32 -ld3d9 -ld3dx9
+	GL_LIB := -lopengl32
+	PLATFORM_EXT := win32
+   FFMPEGINCFLAGS += -I$(FFMPEGDIR)/Windows/$(TARGET_ARCH)/include
+   FFMPEGLDFLAGS += -lavformat -lavcodec -lavutil -lswresample -lswscale
+   INCFLAGS += -include $(CORE_DIR)/Windows/mingw_defines.h
+   ifneq (,$(findstring 64,$(TARGET_ARCH)))
+		LDFLAGS += -L$(CORE_DIR)/dx9sdk/Lib/x64
+	else
+		LDFLAGS += -L$(CORE_DIR)/dx9sdk/Lib/x86
+	endif
+   fpic = -fPIC
+	CC = gcc
+	CXX = g++
+endif
+
+include Makefile.common
+
+ifeq ($(GLES), 1)
+	GLFLAGS += -DGLES -DUSING_GLES2
+else
+	GLFLAGS += -DHAVE_OPENGL
+endif
+
+COREFLAGS += -D__LIBRETRO__ -DPPSSPP -DUSE_FFMPEG -DGLEW_STATIC -DGLEW_NO_GLU
+
+ifeq ($(DEBUG), 1)
+	ifneq (,$(findstring msvc,$(platform)))
+		CPUOPTS += -Od -MDd -Zi -FS
+		LDFLAGS += -DEBUG
+	else
+		CPUOPTS += -O0 -g
+	endif
+	CPUOPTS += -D_DEBUG
+else
+	CPUOPTS += -O2 -D_NDEBUG
+endif
+
+ifeq (,$(findstring msvc,$(platform)))
+   CXXFLAGS += -std=c++11
+endif
+
+### Finalize ###
+OBJECTS		+= $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o) $(ASMFILES:.S=.o)
+CXXFLAGS    += $(CPUOPTS) $(COREFLAGS) $(FFMPEGINCFLAGS) $(INCFLAGS) $(INCFLAGS_PLATFORM) $(PLATCFLAGS) $(fpic) $(PLATCFLAGS) $(CPUFLAGS) $(GLFLAGS) $(DYNAFLAGS)
+CFLAGS		+= $(CPUOPTS) $(COREFLAGS) $(FFMPEGINCFLAGS) $(INCFLAGS) $(INCFLAGS_PLATFORM) $(PLATCFLAGS) $(fpic) $(PLATCFLAGS) $(CPUFLAGS) $(GLFLAGS) $(DYNAFLAGS)
+
+LDFLAGS		+= $(FFMPEGLDFLAGS) $(fpic)
+ifeq (,$(findstring android,$(platform))$(findstring msvc,$(platform)))
+   LDFLAGS	+= -lpthread
+endif
+
+OBJOUT   = -o
+LINKOUT  = -o 
+
+ifneq (,$(findstring msvc,$(platform)))
+	OBJOUT = -Fo
+	LINKOUT = -out:
+	LD = link.exe
+else ifneq (,$(findstring osx,$(platform)))
+	LD = $(CXX)
+else
+	LD = $(CXX)
+   CFLAGS += -ffunction-sections -fdata-sections
+   CXXFLAGS += -ffunction-sections -fdata-sections
+   LDFLAGS += -Wl,--gc-sections
+endif
+
+all: $(TARGET)
+
+%.o: %.S
+	$(AS) $(CFLAGS) -c $(OBJOUT)$@ $<
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
+
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c $(OBJOUT)$@ $<
+
+$(TARGET): $(OBJECTS)
+ifeq ($(STATIC_LINKING), 1)
+	$(AR) rcs $A $(OBJECTS)
+else
+	$(LD) $(LINKOUT)$@ $(OBJECTS) $(LDFLAGS) $(GL_LIB)
+endif
+
+clean:
+	rm -f $(OBJECTS) $(TARGET)
+
+.PHONY: clean
+
+print-%:
+	@echo '$*=$($*)'
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
new file mode 100644
index 0000000000..c732d9a1e4
--- /dev/null
+++ b/libretro/Makefile.common
@@ -0,0 +1,692 @@
+FFMPEGDIR		= $(CORE_DIR)/ffmpeg
+LIBRETRODIR		= $(CORE_DIR)/libretro
+COREDIR			= $(CORE_DIR)/Core
+COMMONDIR		= $(CORE_DIR)/Common
+GPUCOMMONDIR		= $(CORE_DIR)/GPU/Common
+GPUDIR			= $(CORE_DIR)/GPU
+EXTDIR			= $(CORE_DIR)/ext
+NATIVEDIR		= $(EXTDIR)/native
+
+INCFLAGS += \
+	-I$(CORE_DIR) \
+	-I$(COMMONDIR) \
+	-I$(CORE_DIR)/libretro \
+	-I$(EXTDIR)/native \
+	-I$(EXTDIR)/zlib \
+	-I$(EXTDIR)/snappy \
+	-I$(FFMPEGDIR) \
+	$(FFMPEGINCFLAGS) \
+	-I$(EXTDIR)/cityhash \
+	-I$(EXTDIR)/armips \
+	-I$(NATIVEDIR)/ext \
+	-I$(NATIVEDIR) \
+	-I$(EXTDIR)/libkirk \
+	-I$(EXTDIR)/xbrz \
+	-I$(EXTDIR)/xxhash \
+	-I$(EXTDIR)/glew
+
+ifeq ($(PLATFORM_EXT), android)
+	INCFLAGS += -I$(NATIVEDIR)/ext/libzip
+	SOURCES_C += \
+		$(NATIVEDIR)/ext/libzip/mkstemp.c \
+		$(NATIVEDIR)/ext/libzip/zip_add.c \
+		$(NATIVEDIR)/ext/libzip/zip_add_dir.c \
+		$(NATIVEDIR)/ext/libzip/zip_close.c \
+		$(NATIVEDIR)/ext/libzip/zip_delete.c \
+		$(NATIVEDIR)/ext/libzip/zip_dirent.c \
+		$(NATIVEDIR)/ext/libzip/zip_entry_free.c \
+		$(NATIVEDIR)/ext/libzip/zip_entry_new.c \
+		$(NATIVEDIR)/ext/libzip/zip_err_str.c \
+		$(NATIVEDIR)/ext/libzip/zip_error.c \
+		$(NATIVEDIR)/ext/libzip/zip_error_clear.c \
+		$(NATIVEDIR)/ext/libzip/zip_error_get.c \
+		$(NATIVEDIR)/ext/libzip/zip_error_get_sys_type.c \
+		$(NATIVEDIR)/ext/libzip/zip_error_strerror.c \
+		$(NATIVEDIR)/ext/libzip/zip_error_to_str.c \
+		$(NATIVEDIR)/ext/libzip/zip_fclose.c \
+		$(NATIVEDIR)/ext/libzip/zip_file_error_clear.c \
+		$(NATIVEDIR)/ext/libzip/zip_file_error_get.c \
+		$(NATIVEDIR)/ext/libzip/zip_file_get_offset.c \
+		$(NATIVEDIR)/ext/libzip/zip_file_strerror.c \
+		$(NATIVEDIR)/ext/libzip/zip_filerange_crc.c \
+		$(NATIVEDIR)/ext/libzip/zip_fopen.c \
+		$(NATIVEDIR)/ext/libzip/zip_fopen_index.c \
+		$(NATIVEDIR)/ext/libzip/zip_fread.c \
+		$(NATIVEDIR)/ext/libzip/zip_free.c \
+		$(NATIVEDIR)/ext/libzip/zip_get_archive_comment.c \
+		$(NATIVEDIR)/ext/libzip/zip_get_archive_flag.c \
+		$(NATIVEDIR)/ext/libzip/zip_get_file_comment.c \
+		$(NATIVEDIR)/ext/libzip/zip_get_name.c \
+		$(NATIVEDIR)/ext/libzip/zip_get_num_files.c \
+		$(NATIVEDIR)/ext/libzip/zip_memdup.c \
+		$(NATIVEDIR)/ext/libzip/zip_name_locate.c \
+		$(NATIVEDIR)/ext/libzip/zip_new.c \
+		$(NATIVEDIR)/ext/libzip/zip_open.c \
+		$(NATIVEDIR)/ext/libzip/zip_rename.c \
+		$(NATIVEDIR)/ext/libzip/zip_replace.c \
+		$(NATIVEDIR)/ext/libzip/zip_set_archive_comment.c \
+		$(NATIVEDIR)/ext/libzip/zip_set_archive_flag.c \
+		$(NATIVEDIR)/ext/libzip/zip_set_file_comment.c \
+		$(NATIVEDIR)/ext/libzip/zip_set_name.c \
+		$(NATIVEDIR)/ext/libzip/zip_source_buffer.c \
+		$(NATIVEDIR)/ext/libzip/zip_source_file.c \
+		$(NATIVEDIR)/ext/libzip/zip_source_filep.c \
+		$(NATIVEDIR)/ext/libzip/zip_source_free.c \
+		$(NATIVEDIR)/ext/libzip/zip_source_function.c \
+		$(NATIVEDIR)/ext/libzip/zip_source_zip.c \
+		$(NATIVEDIR)/ext/libzip/zip_stat.c \
+		$(NATIVEDIR)/ext/libzip/zip_stat_index.c \
+		$(NATIVEDIR)/ext/libzip/zip_stat_init.c \
+		$(NATIVEDIR)/ext/libzip/zip_strerror.c \
+		$(NATIVEDIR)/ext/libzip/zip_unchange.c \
+		$(NATIVEDIR)/ext/libzip/zip_unchange_all.c \
+		$(NATIVEDIR)/ext/libzip/zip_unchange_archive.c \
+		$(NATIVEDIR)/ext/libzip/zip_unchange_data.c
+
+	SOURCES_C +=\
+		$(NATIVEDIR)/gfx_es2/gl3stub.c \
+		$(NATIVEDIR)/math/fast/fast_math.c \
+		$(NATIVEDIR)/math/fast/fast_matrix.c
+endif
+
+SOURCES_C += $(EXTDIR)/glew/glew.c
+
+SOURCES_C += \
+	$(EXTDIR)/libkirk/AES.c \
+	$(EXTDIR)/libkirk/amctrl.c \
+	$(EXTDIR)/libkirk/SHA1.c \
+	$(EXTDIR)/libkirk/bn.c \
+	$(EXTDIR)/libkirk/ec.c \
+	$(EXTDIR)/libkirk/kirk_engine.c
+
+SOURCES_C += \
+	$(NATIVEDIR)/ext/libpng17/png.c \
+	$(NATIVEDIR)/ext/libpng17/pngerror.c \
+	$(NATIVEDIR)/ext/libpng17/pngget.c \
+	$(NATIVEDIR)/ext/libpng17/pngmem.c \
+	$(NATIVEDIR)/ext/libpng17/pngread.c \
+	$(NATIVEDIR)/ext/libpng17/pngrio.c \
+	$(NATIVEDIR)/ext/libpng17/pngrtran.c \
+	$(NATIVEDIR)/ext/libpng17/pngrutil.c \
+	$(NATIVEDIR)/ext/libpng17/pngset.c \
+	$(NATIVEDIR)/ext/libpng17/pngtrans.c \
+	$(NATIVEDIR)/ext/libpng17/pngwio.c \
+	$(NATIVEDIR)/ext/libpng17/pngwrite.c \
+	$(NATIVEDIR)/ext/libpng17/pngwtran.c \
+	$(NATIVEDIR)/ext/libpng17/pngwutil.c
+
+SOURCES_C += $(EXTDIR)/sfmt19937/SFMT.c
+SOURCES_C   += $(EXTDIR)/xxhash.c
+
+SOURCES_CXX += \
+	$(EXTDIR)/snappy/snappy-c.cpp \
+	$(EXTDIR)/snappy/snappy.cpp
+
+SOURCES_CXX += $(EXTDIR)/xbrz/xbrz.cpp
+
+SOURCES_CXX += \
+	$(NATIVEDIR)/ext/vjson/json.cpp \
+	$(NATIVEDIR)/ext/vjson/block_allocator.cpp
+
+SOURCES_CXX += $(NATIVEDIR)/ext/cityhash/city.cpp
+
+SOURCES_CXX += \
+	$(COMMONDIR)/Crypto/md5.cpp \
+	$(COMMONDIR)/Crypto/sha1.cpp \
+	$(COMMONDIR)/Crypto/sha256.cpp
+
+SOURCES_CXX += \
+	$(COMMONDIR)/ChunkFile.cpp \
+	$(COMMONDIR)/ConsoleListener.cpp \
+	$(COMMONDIR)/FileUtil.cpp \
+	$(COMMONDIR)/KeyMap.cpp \
+	$(COMMONDIR)/LogManager.cpp \
+	$(COMMONDIR)/OSVersion.cpp \
+	$(COMMONDIR)/MemoryUtil.cpp \
+	$(COMMONDIR)/Misc.cpp \
+	$(COMMONDIR)/MsgHandler.cpp \
+	$(COMMONDIR)/StringUtils.cpp \
+	$(COMMONDIR)/Timer.cpp \
+	$(COMMONDIR)/ThreadPools.cpp
+
+
+
+SOURCES_CXX += \
+	$(GPUCOMMONDIR)/VertexDecoderCommon.cpp \
+	$(GPUCOMMONDIR)/GPUStateUtils.cpp \
+	$(GPUCOMMONDIR)/DrawEngineCommon.cpp \
+	$(GPUCOMMONDIR)/SplineCommon.cpp \
+	$(GPUCOMMONDIR)/FramebufferCommon.cpp \
+	$(GPUCOMMONDIR)/ShaderId.cpp \
+	$(GPUCOMMONDIR)/ShaderCommon.cpp \
+	$(GPUCOMMONDIR)/ShaderUniforms.cpp \
+	$(GPUCOMMONDIR)/ShaderTranslation.cpp \
+	$(GPUCOMMONDIR)/GPUDebugInterface.cpp \
+	$(GPUCOMMONDIR)/DepalettizeShaderCommon.cpp \
+	$(GPUCOMMONDIR)/TransformCommon.cpp \
+	$(GPUCOMMONDIR)/IndexGenerator.cpp \
+	$(GPUCOMMONDIR)/TextureDecoder.cpp \
+	$(GPUCOMMONDIR)/PostShader.cpp \
+	$(COMMONDIR)/ColorConv.cpp \
+	$(GPUDIR)/Debugger/Breakpoints.cpp \
+	$(GPUDIR)/Debugger/Stepping.cpp \
+	$(GPUDIR)/Debugger/Record.cpp \
+	$(GPUDIR)/Common/TextureCacheCommon.cpp \
+	$(GPUDIR)/Common/TextureScalerCommon.cpp \
+	$(GPUDIR)/Common/SoftwareTransformCommon.cpp \
+	$(GPUDIR)/Common/StencilCommon.cpp \
+	$(GPUDIR)/Software/TransformUnit.cpp \
+	$(GPUDIR)/Software/SoftGpu.cpp \
+	$(GPUDIR)/Software/Sampler.cpp \
+	$(GPUDIR)/GeDisasm.cpp \
+	$(GPUDIR)/GPUCommon.cpp \
+	$(GPUDIR)/GPU.cpp \
+	$(GPUDIR)/GPUState.cpp \
+	$(GPUDIR)/Math3D.cpp \
+	$(GPUDIR)/Null/NullGpu.cpp \
+	$(GPUDIR)/Software/Clipper.cpp \
+	$(GPUDIR)/Software/Lighting.cpp \
+	$(GPUDIR)/Software/Rasterizer.cpp \
+	$(GPUDIR)/GLES/DepalettizeShaderGLES.cpp \
+	$(GPUDIR)/GLES/VertexShaderGeneratorGLES.cpp \
+	$(GPUDIR)/GLES/DrawEngineGLES.cpp \
+	$(GPUDIR)/GLES/GPU_GLES.cpp \
+	$(GPUDIR)/GLES/FragmentShaderGeneratorGLES.cpp \
+	$(GPUDIR)/GLES/FragmentTestCacheGLES.cpp \
+	$(GPUDIR)/GLES/FramebufferManagerGLES.cpp \
+	$(GPUDIR)/GLES/TextureCacheGLES.cpp \
+	$(GPUDIR)/GLES/TextureScalerGLES.cpp \
+	$(GPUDIR)/GLES/ShaderManagerGLES.cpp \
+	$(GPUDIR)/GLES/StateMappingGLES.cpp \
+	$(GPUDIR)/GLES/StencilBufferGLES.cpp \
+	$(EXTDIR)/native/base/backtrace.cpp \
+	$(EXTDIR)/native/base/buffer.cpp \
+	$(EXTDIR)/native/base/colorutil.cpp \
+	$(EXTDIR)/native/base/display.cpp \
+   $(EXTDIR)/native/base/logging.cpp \
+	$(EXTDIR)/native/base/stringutil.cpp \
+	$(EXTDIR)/native/base/timeutil.cpp \
+	$(EXTDIR)/native/data/compression.cpp \
+	$(EXTDIR)/glslang/OGLCompilersDLL/InitializeDll.cpp \
+	$(EXTDIR)/glslang/glslang/GenericCodeGen/CodeGen.cpp \
+	$(EXTDIR)/glslang/glslang/GenericCodeGen/Link.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/PpAtom.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/Constant.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/InfoSink.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/Initialize.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/Intermediate.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/IntermTraverse.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/ParseContextBase.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/ParseHelper.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/PoolAlloc.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/RemoveTree.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/Scan.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/ShaderLang.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/SymbolTable.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/Versions.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/glslang_tab.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/intermOut.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/iomapper.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/limits.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/linkValidate.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/parseConst.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/propagateNoContraction.cpp \
+	$(EXTDIR)/glslang/glslang/MachineIndependent/reflection.cpp \
+	$(EXTDIR)/glslang/SPIRV/InReadableOrder.cpp \
+	$(EXTDIR)/glslang/SPIRV/GlslangToSpv.cpp \
+	$(EXTDIR)/glslang/SPIRV/Logger.cpp \
+	$(EXTDIR)/glslang/SPIRV/SpvBuilder.cpp \
+	$(EXTDIR)/SPIRV-Cross/spirv_cfg.cpp \
+	$(EXTDIR)/SPIRV-Cross/spirv_cross.cpp \
+	$(EXTDIR)/SPIRV-Cross/spirv_glsl.cpp \
+   $(EXTDIR)/SPIRV-Cross/spirv_hlsl.cpp
+
+ifeq ($(PLATFORM_EXT), win32)
+SOURCES_CXX += $(COMMONDIR)/MemArenaWin32.cpp \
+	       $(EXTDIR)/glslang/glslang/OSDependent/Windows/ossource.cpp \
+	       $(NATIVEDIR)/gfx_es2/draw_text_win.cpp
+else ifeq ($(PLATFORM_EXT), darwin)
+SOURCES_CXX += $(COMMONDIR)/MemArenaDarwin.cpp \
+	       $(EXTDIR)/glslang/glslang/OSDependent/Unix/ossource.cpp
+else ifeq ($(PLATFORM_EXT), android)
+SOURCES_CXX += $(COMMONDIR)/MemArenaAndroid.cpp \
+	       $(EXTDIR)/glslang/glslang/OSDependent/Unix/ossource.cpp \
+			 $(NATIVEDIR)/gfx_es2/draw_text_android.cpp
+else
+SOURCES_CXX += $(COMMONDIR)/MemArenaPosix.cpp \
+	       $(EXTDIR)/glslang/glslang/OSDependent/Unix/ossource.cpp
+endif
+
+SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
+	       $(NATIVEDIR)/file/fd_util.cpp \
+	       $(NATIVEDIR)/file/file_util.cpp \
+	       $(NATIVEDIR)/file/ini_file.cpp \
+	       $(NATIVEDIR)/file/free.cpp \
+	       $(NATIVEDIR)/file/zip_read.cpp \
+	       $(NATIVEDIR)/gfx/gl_debug_log.cpp \
+	       $(NATIVEDIR)/gfx/texture_atlas.cpp \
+          $(NATIVEDIR)/gfx/d3d9_shader.cpp \
+          $(NATIVEDIR)/gfx/d3d9_state.cpp \
+			 $(NATIVEDIR)/gfx_es2/draw_buffer.cpp \
+          $(NATIVEDIR)/gfx_es2/draw_text.cpp \
+	       $(NATIVEDIR)/gfx_es2/gpu_features.cpp \
+	       $(NATIVEDIR)/gfx_es2/glsl_program.cpp \
+	       $(NATIVEDIR)/i18n/i18n.cpp \
+	       $(NATIVEDIR)/image/zim_load.cpp \
+	       $(NATIVEDIR)/image/png_load.cpp \
+	       $(NATIVEDIR)/input/gesture_detector.cpp \
+	       $(NATIVEDIR)/input/input_state.cpp \
+	       $(NATIVEDIR)/math/curves.cpp \
+	       $(NATIVEDIR)/math/expression_parser.cpp \
+	       $(NATIVEDIR)/math/lin/matrix4x4.cpp \
+          $(NATIVEDIR)/math/lin/plane.cpp \
+          $(NATIVEDIR)/math/lin/quat.cpp \
+          $(NATIVEDIR)/math/lin/vec3.cpp \
+	       $(NATIVEDIR)/net/http_client.cpp \
+	       $(NATIVEDIR)/net/resolve.cpp \
+	       $(NATIVEDIR)/net/url.cpp \
+	       $(NATIVEDIR)/thin3d/thin3d.cpp \
+			 $(NATIVEDIR)/thin3d/thin3d_gl.cpp \
+          $(NATIVEDIR)/thin3d/GLRenderManager.cpp \
+          $(NATIVEDIR)/thin3d/GLQueueRunner.cpp \
+          $(NATIVEDIR)/thin3d/DataFormatGL.cpp \
+	       $(NATIVEDIR)/thread/threadutil.cpp \
+	       $(NATIVEDIR)/thread/threadpool.cpp \
+	       $(NATIVEDIR)/ui/screen.cpp \
+	       $(NATIVEDIR)/ui/ui.cpp \
+          $(NATIVEDIR)/ui/ui_context.cpp \
+	       $(NATIVEDIR)/ui/ui_screen.cpp \
+	       $(NATIVEDIR)/ui/ui_tween.cpp \
+	       $(NATIVEDIR)/ui/view.cpp \
+	       $(NATIVEDIR)/ui/viewgroup.cpp \
+	       $(NATIVEDIR)/util/hash/hash.cpp \
+	       $(NATIVEDIR)/util/text/utf8.cpp \
+	       $(NATIVEDIR)/util/text/parsers.cpp \
+	       $(NATIVEDIR)/util/text/wrap_text.cpp \
+	       $(NATIVEDIR)/ext/jpge/jpgd.cpp \
+	       $(NATIVEDIR)/ext/jpge/jpge.cpp \
+	       $(COREDIR)/AVIDump.cpp \
+	       $(COREDIR)/Config.cpp \
+	       $(COREDIR)/TextureReplacer.cpp \
+	       $(COREDIR)/Core.cpp \
+	       $(COREDIR)/WaveFile.cpp \
+	       $(COREDIR)/FileLoaders/HTTPFileLoader.cpp \
+	       $(COREDIR)/FileLoaders/CachingFileLoader.cpp \
+	       $(COREDIR)/FileLoaders/DiskCachingFileLoader.cpp \
+	       $(COREDIR)/FileLoaders/RetryingFileLoader.cpp \
+	       $(COREDIR)/FileLoaders/RamCachingFileLoader.cpp \
+	       $(COREDIR)/FileLoaders/LocalFileLoader.cpp \
+	       $(COREDIR)/CoreTiming.cpp \
+	       $(COREDIR)/CwCheat.cpp \
+	       $(COREDIR)/HDRemaster.cpp \
+	       $(COREDIR)/Debugger/Breakpoints.cpp \
+	       $(COREDIR)/Debugger/SymbolMap.cpp \
+	       $(COREDIR)/Dialog/PSPDialog.cpp \
+	       $(COREDIR)/Dialog/PSPGamedataInstallDialog.cpp \
+	       $(COREDIR)/Dialog/PSPMsgDialog.cpp \
+	       $(COREDIR)/Dialog/PSPNetconfDialog.cpp \
+	       $(COREDIR)/Dialog/PSPOskDialog.cpp \
+	       $(COREDIR)/Dialog/PSPSaveDialog.cpp \
+	       $(COREDIR)/Dialog/PSPScreenshotDialog.cpp \
+	       $(COREDIR)/Dialog/SavedataParam.cpp \
+	       $(COREDIR)/ELF/ElfReader.cpp \
+	       $(COREDIR)/ELF/PBPReader.cpp \
+	       $(COREDIR)/ELF/PrxDecrypter.cpp \
+	       $(COREDIR)/ELF/ParamSFO.cpp \
+	       $(COREDIR)/FileSystems/tlzrc.cpp \
+	       $(COREDIR)/FileSystems/BlockDevices.cpp \
+	       $(COREDIR)/FileSystems/BlobFileSystem.cpp \
+	       $(COREDIR)/FileSystems/DirectoryFileSystem.cpp \
+	       $(COREDIR)/FileSystems/FileSystem.cpp \
+	       $(COREDIR)/FileSystems/ISOFileSystem.cpp \
+	       $(COREDIR)/FileSystems/MetaFileSystem.cpp \
+	       $(COREDIR)/FileSystems/VirtualDiscFileSystem.cpp \
+	       $(COREDIR)/Font/PGF.cpp \
+	       $(COREDIR)/HLE/HLE.cpp \
+	       $(COREDIR)/HLE/KUBridge.cpp \
+	       $(COREDIR)/HLE/sceSha256.cpp \
+	       $(COREDIR)/HLE/sceG729.cpp \
+	       $(COREDIR)/HLE/sceSfmt19937.cpp \
+	       $(COREDIR)/HLE/ReplaceTables.cpp \
+	       $(COREDIR)/HLE/HLEHelperThread.cpp \
+	       $(COREDIR)/HLE/HLETables.cpp \
+	       $(COREDIR)/HLE/sceAdler.cpp \
+	       $(COREDIR)/HLE/sceAtrac.cpp \
+	       $(COREDIR)/HLE/sceAudio.cpp \
+	       $(COREDIR)/HLE/sceAudiocodec.cpp \
+	       $(COREDIR)/HLE/sceAudioRouting.cpp \
+	       $(COREDIR)/HLE/sceCcc.cpp \
+	       $(COREDIR)/HLE/sceChnnlsv.cpp \
+	       $(COREDIR)/HLE/sceCtrl.cpp \
+	       $(COREDIR)/HLE/sceDeflt.cpp \
+	       $(COREDIR)/HLE/sceDisplay.cpp \
+	       $(COREDIR)/HLE/sceDmac.cpp \
+	       $(COREDIR)/HLE/sceGameUpdate.cpp \
+	       $(COREDIR)/HLE/sceGe.cpp \
+	       $(COREDIR)/HLE/sceFont.cpp \
+	       $(COREDIR)/HLE/sceHeap.cpp \
+	       $(COREDIR)/HLE/sceHprm.cpp \
+	       $(COREDIR)/HLE/sceHttp.cpp \
+	       $(COREDIR)/HLE/sceImpose.cpp \
+	       $(COREDIR)/HLE/sceIo.cpp \
+	       $(COREDIR)/HLE/sceJpeg.cpp \
+	       $(COREDIR)/HLE/sceKernel.cpp \
+	       $(COREDIR)/HLE/sceKernelAlarm.cpp \
+	       $(COREDIR)/HLE/sceKernelEventFlag.cpp \
+	       $(COREDIR)/HLE/sceKernelInterrupt.cpp \
+	       $(COREDIR)/HLE/sceKernelMbx.cpp \
+	       $(COREDIR)/HLE/sceKernelMemory.cpp \
+	       $(COREDIR)/HLE/sceKernelModule.cpp \
+	       $(COREDIR)/HLE/sceKernelMsgPipe.cpp \
+	       $(COREDIR)/HLE/sceKernelMutex.cpp \
+	       $(COREDIR)/HLE/sceKernelSemaphore.cpp \
+	       $(COREDIR)/HLE/sceKernelThread.cpp \
+	       $(COREDIR)/HLE/sceKernelTime.cpp \
+	       $(COREDIR)/HLE/sceKernelVTimer.cpp \
+	       $(COREDIR)/HLE/sceMpeg.cpp \
+	       $(COREDIR)/HLE/sceNet.cpp \
+	       $(COREDIR)/HLE/sceNetAdhoc.cpp \
+	       $(COREDIR)/HLE/proAdhocServer.cpp \
+	       $(COREDIR)/HLE/proAdhoc.cpp \
+	       $(COREDIR)/HLE/sceOpenPSID.cpp \
+	       $(COREDIR)/HLE/sceP3da.cpp \
+	       $(COREDIR)/HLE/sceMt19937.cpp \
+	       $(COREDIR)/HLE/sceMd5.cpp \
+	       $(COREDIR)/HLE/sceMp4.cpp \
+	       $(COREDIR)/HLE/sceMp3.cpp \
+	       $(COREDIR)/HLE/sceParseHttp.cpp \
+	       $(COREDIR)/HLE/sceParseUri.cpp \
+	       $(COREDIR)/HLE/scePower.cpp \
+	       $(COREDIR)/HLE/scePsmf.cpp \
+	       $(COREDIR)/HLE/sceRtc.cpp \
+	       $(COREDIR)/HLE/sceSas.cpp \
+	       $(COREDIR)/HLE/sceSsl.cpp \
+	       $(COREDIR)/HLE/sceUmd.cpp \
+	       $(COREDIR)/HLE/sceUsb.cpp \
+	       $(COREDIR)/HLE/sceUsbCam.cpp \
+	       $(COREDIR)/HLE/sceUtility.cpp \
+	       $(COREDIR)/HLE/sceVaudio.cpp \
+	       $(COREDIR)/HLE/scePspNpDrm_user.cpp \
+	       $(COREDIR)/HLE/sceNp.cpp \
+	       $(COREDIR)/HLE/scePauth.cpp \
+	       $(COREDIR)/HLE/sceUsbGps.cpp \
+	       $(COREDIR)/HW/SimpleAudioDec.cpp \
+	       $(COREDIR)/HW/AsyncIOManager.cpp \
+	       $(COREDIR)/HW/MediaEngine.cpp \
+	       $(COREDIR)/HW/MpegDemux.cpp \
+	       $(COREDIR)/HW/MemoryStick.cpp \
+	       $(COREDIR)/HW/SasAudio.cpp \
+	       $(COREDIR)/HW/SasReverb.cpp \
+	       $(COREDIR)/HW/StereoResampler.cpp \
+	       $(COREDIR)/Compatibility.cpp \
+	       $(COREDIR)/Host.cpp \
+	       $(COREDIR)/Loaders.cpp \
+	       $(COREDIR)/MIPS/JitCommon/JitCommon.cpp \
+	       $(COREDIR)/MIPS/JitCommon/JitState.cpp \
+	       $(COREDIR)/MIPS/JitCommon/JitBlockCache.cpp \
+	       $(COREDIR)/MIPS/IR/IRCompALU.cpp \
+	       $(COREDIR)/MIPS/IR/IRCompBranch.cpp \
+	       $(COREDIR)/MIPS/IR/IRCompFPU.cpp \
+	       $(COREDIR)/MIPS/IR/IRCompLoadStore.cpp \
+	       $(COREDIR)/MIPS/IR/IRCompVFPU.cpp \
+	       $(COREDIR)/MIPS/IR/IRInterpreter.cpp \
+	       $(COREDIR)/MIPS/IR/IRJit.cpp \
+	       $(COREDIR)/MIPS/IR/IRInst.cpp \
+	       $(COREDIR)/MIPS/IR/IRPassSimplify.cpp \
+	       $(COREDIR)/MIPS/IR/IRRegCache.cpp \
+	       $(COREDIR)/MIPS/IR/IRFrontend.cpp \
+	       $(COREDIR)/MIPS/MIPS.cpp \
+	       $(COREDIR)/MIPS/MIPSAnalyst.cpp \
+	       $(COREDIR)/MIPS/MIPSCodeUtils.cpp \
+	       $(COREDIR)/MIPS/MIPSDebugInterface.cpp \
+	       $(COREDIR)/MIPS/MIPSDis.cpp \
+	       $(COREDIR)/MIPS/MIPSDisVFPU.cpp \
+	       $(COREDIR)/MIPS/MIPSInt.cpp \
+	       $(COREDIR)/MIPS/MIPSIntVFPU.cpp \
+	       $(COREDIR)/MIPS/MIPSTables.cpp \
+	       $(COREDIR)/MIPS/MIPSVFPUUtils.cpp \
+	       $(COREDIR)/MemMap.cpp \
+	       $(COREDIR)/MemMapFunctions.cpp \
+	       $(COREDIR)/PSPLoaders.cpp \
+	       $(COREDIR)/Reporting.cpp \
+	       $(COREDIR)/SaveState.cpp \
+	       $(COREDIR)/Screenshot.cpp \
+	       $(COREDIR)/System.cpp \
+	       $(COREDIR)/Util/BlockAllocator.cpp \
+	       $(COREDIR)/Util/PPGeDraw.cpp \
+	       $(COREDIR)/Util/ppge_atlas.cpp \
+	       $(COREDIR)/Util/AudioFormat.cpp \
+          $(EXTDIR)/disarm.cpp \
+          $(CORE_DIR)/UI/TextureUtil.cpp
+
+SOURCES_CXX += $(COREDIR)/HLE/__sceAudio.cpp
+
+### DYNAREC ###
+ifeq ($(WITH_DYNAREC),1)
+   DYNAFLAGS += -DDYNAREC
+   ifeq ($(TARGET_ARCH),arm)
+      DYNAFLAGS += -D_ARCH_32
+		SOURCES_CXX += $(COMMONDIR)/ArmEmitter.cpp \
+			       $(COMMONDIR)/ArmCPUDetect.cpp \
+			       $(COREDIR)/MIPS/ARM/ArmAsm.cpp \
+			       $(COREDIR)/MIPS/ARM/ArmCompALU.cpp \
+			       $(COREDIR)/MIPS/ARM/ArmCompBranch.cpp \
+			       $(COREDIR)/MIPS/ARM/ArmCompFPU.cpp \
+			       $(COREDIR)/MIPS/ARM/ArmCompLoadStore.cpp \
+			       $(COREDIR)/MIPS/ARM/ArmCompVFPU.cpp \
+			       $(COREDIR)/MIPS/ARM/ArmCompReplace.cpp \
+			       $(COREDIR)/MIPS/ARM/ArmJit.cpp \
+			       $(COREDIR)/MIPS/ARM/ArmRegCache.cpp \
+			       $(COREDIR)/MIPS/ARM/ArmRegCacheFPU.cpp \
+			       $(GPUCOMMONDIR)/VertexDecoderArm.cpp
+
+		ifeq ($(HAVE_NEON),1)
+			SOURCES_CXX   += \
+					 $(COREDIR)/MIPS/ARM/ArmCompVFPUNEON.cpp \
+					 $(COREDIR)/MIPS/ARM/ArmCompVFPUNEONUtil.cpp \
+					 $(COREDIR)/Util/AudioFormatNEON.cpp \
+					 $(COMMONDIR)/ColorConvNEON.cpp \
+					 $(GPUDIR)/Common/TextureDecoderNEON.cpp
+
+			SOURCES_C += $(NATIVEDIR)/ext/libpng17/arm/arm_init.c \
+				     $(NATIVEDIR)/ext/libpng17/arm/filter_neon_intrinsics.c
+			ASMFILES   += $(NATIVEDIR)/math/fast/fast_matrix_neon.S \
+				      $(NATIVEDIR)/ext/libpng17/arm/filter_neon.S
+		endif
+	else ifeq ($(TARGET_ARCH),arm64)
+      DYNAFLAGS += -D_ARCH_64
+      SOURCES_CXX += $(COMMONDIR)/Arm64Emitter.cpp \
+		     $(COMMONDIR)/ArmCPUDetect.cpp \
+		     $(COREDIR)/MIPS/ARM64/Arm64Asm.cpp \
+		     $(COREDIR)/MIPS/ARM64/Arm64CompALU.cpp \
+		     $(COREDIR)/MIPS/ARM64/Arm64CompBranch.cpp \
+		     $(COREDIR)/MIPS/ARM64/Arm64CompFPU.cpp \
+		     $(COREDIR)/MIPS/ARM64/Arm64CompLoadStore.cpp \
+		     $(COREDIR)/MIPS/ARM64/Arm64CompVFPU.cpp \
+		     $(COREDIR)/MIPS/ARM64/Arm64CompReplace.cpp \
+		     $(COREDIR)/MIPS/ARM64/Arm64Jit.cpp \
+		     $(COREDIR)/MIPS/ARM64/Arm64RegCache.cpp \
+		     $(COREDIR)/MIPS/ARM64/Arm64RegCacheFPU.cpp \
+		     $(COREDIR)/Util/DisArm64.cpp \
+		     $(GPUCOMMONDIR)/VertexDecoderArm64.cpp
+
+		ifeq ($(HAVE_NEON),1)
+			SOURCES_CXX   += \
+					 $(COREDIR)/MIPS/ARM/ArmCompVFPUNEON.cpp \
+					 $(COREDIR)/MIPS/ARM/ArmCompVFPUNEONUtil.cpp \
+					 $(COMMONDIR)/ColorConvNEON.cpp \
+					 $(GPUDIR)/Common/TextureDecoderNEON.cpp
+
+			SOURCES_C += $(NATIVEDIR)/ext/libpng17/arm/arm_init.c \
+				     $(NATIVEDIR)/ext/libpng17/arm/filter_neon_intrinsics.c
+			ASMFILES   += $(NATIVEDIR)/math/fast/fast_matrix_neon.S \
+				      $(NATIVEDIR)/ext/libpng17/arm/filter_neon.S
+		endif
+   else
+	ifneq (,$(findstring msvc,$(platform)))
+	ifeq (,$(findstring x64,$(platform)))
+		CPUFLAGS += /arch:SSE2
+	endif
+		CPUFLAGS += -D_M_IX86_FP
+	else
+		CPUFLAGS += -msse -msse2
+endif
+      ifeq ($(TARGET_ARCH),x86_64)
+         CPUFLAGS += -D_M_X64 -D_ARCH_64
+      else
+         CPUFLAGS += -D_M_IX86 -D_ARCH_32
+         ifeq (,$(findstring msvc,$(platform)))
+            CPUFLAGS += -m32
+         endif
+      endif
+	   SOURCES_CXX += $(GPUDIR)/Software/SamplerX86.cpp
+	   SOURCES_CXX += $(COMMONDIR)/x64Emitter.cpp \
+						$(COMMONDIR)/ABI.cpp \
+						$(COMMONDIR)/Thunk.cpp \
+						$(COMMONDIR)/CPUDetect.cpp \
+						$(COREDIR)/MIPS/x86/CompReplace.cpp \
+						$(COREDIR)/MIPS/x86/CompBranch.cpp \
+						$(COREDIR)/MIPS/x86/Asm.cpp \
+						$(COREDIR)/MIPS/x86/CompALU.cpp \
+						$(COREDIR)/MIPS/x86/CompVFPU.cpp \
+						$(COREDIR)/MIPS/x86/CompLoadStore.cpp \
+						$(COREDIR)/MIPS/x86/CompFPU.cpp \
+						$(COREDIR)/MIPS/x86/Jit.cpp \
+						$(COREDIR)/MIPS/x86/JitSafeMem.cpp \
+						$(COREDIR)/MIPS/x86/RegCache.cpp \
+						$(COREDIR)/MIPS/x86/RegCacheFPU.cpp \
+						$(GPUDIR)/Common/VertexDecoderX86.cpp
+		SOURCES_C   += $(NATIVEDIR)/math/fast/fast_matrix_sse.c
+   endif
+endif
+SOURCES_CXX += \
+   $(COMMONDIR)/ArmEmitter.cpp \
+   $(COMMONDIR)/Arm64Emitter.cpp \
+   $(COREDIR)/Util/DisArm64.cpp
+
+#UDIS86
+# Compiled and linked even on ARM for now
+
+SOURCES_C += $(EXTDIR)/udis86/decode.c \
+			 $(EXTDIR)/udis86/itab.c \
+			 $(EXTDIR)/udis86/syn-intel.c \
+			 $(EXTDIR)/udis86/syn.c \
+			 $(EXTDIR)/udis86/udis86.c
+
+ifeq ($(PLATFORM_EXT), darwin)
+	COREFLAGS += -DNO_VULKAN
+else
+	SOURCES_CXX += \
+		$(COMMONDIR)/Vulkan/SPIRVDisasm.cpp \
+		$(COMMONDIR)/Vulkan/VulkanContext.cpp \
+		$(COMMONDIR)/Vulkan/VulkanDebug.cpp \
+		$(COMMONDIR)/Vulkan/VulkanImage.cpp \
+		$(COMMONDIR)/Vulkan/VulkanLoader.cpp \
+		$(COMMONDIR)/Vulkan/VulkanMemory.cpp \
+		$(NATIVEDIR)/thin3d/thin3d_vulkan.cpp \
+		$(NATIVEDIR)/thin3d/VulkanRenderManager.cpp \
+		$(NATIVEDIR)/thin3d/VulkanQueueRunner.cpp \
+		$(GPUDIR)/Vulkan/DepalettizeShaderVulkan.cpp \
+		$(GPUDIR)/Vulkan/DrawEngineVulkan.cpp \
+		$(GPUDIR)/Vulkan/FragmentShaderGeneratorVulkan.cpp \
+		$(GPUDIR)/Vulkan/FramebufferVulkan.cpp \
+		$(GPUDIR)/Vulkan/GPU_Vulkan.cpp \
+		$(GPUDIR)/Vulkan/PipelineManagerVulkan.cpp \
+		$(GPUDIR)/Vulkan/ShaderManagerVulkan.cpp \
+		$(GPUDIR)/Vulkan/StateMappingVulkan.cpp \
+		$(GPUDIR)/Vulkan/StencilBufferVulkan.cpp \
+		$(GPUDIR)/Vulkan/TextureCacheVulkan.cpp \
+		$(GPUDIR)/Vulkan/TextureScalerVulkan.cpp \
+		$(GPUDIR)/Vulkan/VertexShaderGeneratorVulkan.cpp \
+		$(GPUDIR)/Vulkan/VulkanUtil.cpp \
+		$(LIBRETRODIR)/LibretroVulkanContext.cpp \
+		$(LIBRETRODIR)/libretro_vulkan.cpp
+
+	ifeq ($(PLATFORM_EXT), unix)
+		COREFLAGS += -DVK_USE_PLATFORM_XLIB_KHR
+	endif
+endif
+
+ifeq ($(PLATFORM_EXT), win32)
+SOURCES_CXX += \
+	$(GPUDIR)/Directx9/DepalettizeShaderDX9.cpp \
+	$(GPUDIR)/Directx9/DrawEngineDX9.cpp \
+	$(GPUDIR)/Directx9/PixelShaderGeneratorDX9.cpp \
+	$(GPUDIR)/Directx9/FramebufferDX9.cpp \
+	$(GPUDIR)/Directx9/GPU_DX9.cpp \
+	$(GPUDIR)/Directx9/ShaderManagerDX9.cpp \
+	$(GPUDIR)/Directx9/StateMappingDX9.cpp \
+	$(GPUDIR)/Directx9/StencilBufferDX9.cpp \
+	$(GPUDIR)/Directx9/TextureCacheDX9.cpp \
+	$(GPUDIR)/Directx9/TextureScalerDX9.cpp \
+	$(GPUDIR)/Directx9/VertexShaderGeneratorDX9.cpp
+
+SOURCES_CXX += \
+	$(GPUDIR)/D3D11/DepalettizeShaderD3D11.cpp \
+	$(GPUDIR)/D3D11/DrawEngineD3D11.cpp \
+	$(GPUDIR)/D3D11/FragmentShaderGeneratorD3D11.cpp \
+	$(GPUDIR)/D3D11/FramebufferManagerD3D11.cpp \
+	$(GPUDIR)/D3D11/GPU_D3D11.cpp \
+	$(GPUDIR)/D3D11/D3D11Util.cpp \
+	$(GPUDIR)/D3D11/ShaderManagerD3D11.cpp \
+	$(GPUDIR)/D3D11/StateMappingD3D11.cpp \
+	$(GPUDIR)/D3D11/StencilBufferD3D11.cpp \
+	$(GPUDIR)/D3D11/TextureCacheD3D11.cpp \
+	$(GPUDIR)/D3D11/TextureScalerD3D11.cpp \
+	$(GPUDIR)/D3D11/VertexShaderGeneratorD3D11.cpp \
+   $(LIBRETRODIR)/LibretroD3D11Context.cpp
+
+SOURCES_CXX += \
+   $(NATIVEDIR)/thin3d/thin3d_d3d9.cpp \
+   $(NATIVEDIR)/thin3d/thin3d_d3d11.cpp \
+   $(NATIVEDIR)/thin3d/d3dx9_loader.cpp \
+   $(NATIVEDIR)/thin3d/d3d11_loader.cpp
+
+INCFLAGS += -I$(CORE_DIR)/dx9sdk/Include -I$(CORE_DIR)/dx9sdk/Include/DX11
+
+endif
+
+SOURCES_CXX += \
+		$(LIBRETRODIR)/libretro.cpp \
+		$(LIBRETRODIR)/LibretroGraphicsContext.cpp \
+		$(LIBRETRODIR)/LibretroGLContext.cpp
+
+ifneq ($(STATIC_LINKING), 1)
+SOURCES_C += \
+		$(EXTDIR)/zlib/adler32.c \
+		$(EXTDIR)/zlib/compress.c \
+		$(EXTDIR)/zlib/crc32.c \
+		$(EXTDIR)/zlib/deflate.c \
+		$(EXTDIR)/zlib/gzclose.c \
+		$(EXTDIR)/zlib/gzlib.c \
+		$(EXTDIR)/zlib/gzread.c \
+		$(EXTDIR)/zlib/gzwrite.c \
+		$(EXTDIR)/zlib/inffast.c \
+		$(EXTDIR)/zlib/inflate.c \
+		$(EXTDIR)/zlib/inftrees.c \
+		$(EXTDIR)/zlib/trees.c \
+		$(EXTDIR)/zlib/uncompr.c \
+		$(EXTDIR)/zlib/zutil.c
+endif
+
+GIT_VERSION_SRC = $(CORE_DIR)/git-version.cpp
+GIT_VERSION := $(shell git describe --always || echo v1.4.2-git)
+GIT_VERSION_NO_UPDATE = $(findstring 1,$(shell grep -s PPSSPP_GIT_VERSION_NO_UPDATE $(GIT_VERSION_SRC)))
+ifneq (,$(findstring $(GIT_VERSION),$(shell grep -s char $(GIT_VERSION_SRC))))
+   GIT_VERSION_NO_UPDATE = 1
+endif
+
+ifneq ($(GIT_VERSION_NO_UPDATE),1)
+   $(shell echo '// This is a generated file.' > $(GIT_VERSION_SRC))
+   $(shell echo >> $(GIT_VERSION_SRC))
+   $(shell echo 'const char *PPSSPP_GIT_VERSION = "${GIT_VERSION}";' >> $(GIT_VERSION_SRC))
+   $(shell echo >> $(GIT_VERSION_SRC))
+   $(shell echo "// If you don't want this file to update/recompile, change to 1." >> $(GIT_VERSION_SRC))
+   $(shell echo '#define PPSSPP_GIT_VERSION_NO_UPDATE 0' >> $(GIT_VERSION_SRC))
+endif
+
+SOURCES_CXX += $(GIT_VERSION_SRC)
diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk
new file mode 100644
index 0000000000..83a0dc7b25
--- /dev/null
+++ b/libretro/jni/Android.mk
@@ -0,0 +1,82 @@
+LOCAL_PATH := $(call my-dir)
+
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+	COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
+
+COREFLAGS  :=
+CORE_DIR   := ../..
+FFMPEGDIR  := $(CORE_DIR)/ffmpeg
+FFMPEGLIBS += libavformat libavcodec libavutil libswresample libswscale
+
+ifeq ($(TARGET_ARCH),arm64)
+  COREFLAGS += -DARM64 -D_ARCH_64
+  HAVE_NEON := 1
+  FFMPEGLIBDIR := $(FFMPEGDIR)/android/arm64/lib
+  FFMPEGINCFLAGS := -I$(FFMPEGDIR)/android/arm64/include
+endif
+
+ifeq ($(TARGET_ARCH),arm)
+  COREFLAGS += -DARM -DARMEABI_V7A -D__arm__ -DARM_ASM -D_ARCH_32 -mfpu=neon
+  HAVE_NEON := 1
+  FFMPEGLIBDIR := $(FFMPEGDIR)/android/armv7/lib
+  FFMPEGINCFLAGS := -I$(FFMPEGDIR)/android/armv7/include
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+  COREFLAGS += -D_ARCH_32 -D_M_IX86 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3 -mstackrealign
+  FFMPEGLIBDIR := $(FFMPEGDIR)/android/x86/lib
+  FFMPEGINCFLAGS := -I$(FFMPEGDIR)/android/x86/include
+endif
+
+ifeq ($(TARGET_ARCH),x86_64)
+  COREFLAGS += -D_ARCH_64 -D_M_X64 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3 -mstackrealign
+  FFMPEGLIBDIR := $(FFMPEGDIR)/android/x86_64/lib
+  FFMPEGINCFLAGS := -I$(FFMPEGDIR)/android/x86_64/include
+endif
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libavformat
+LOCAL_SRC_FILES := $(FFMPEGLIBDIR)/libavformat.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libavcodec
+LOCAL_SRC_FILES := $(FFMPEGLIBDIR)/libavcodec.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libavutil
+LOCAL_SRC_FILES := $(FFMPEGLIBDIR)/libavutil.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libswresample
+LOCAL_SRC_FILES := $(FFMPEGLIBDIR)/libswresample.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libswscale
+LOCAL_SRC_FILES := $(FFMPEGLIBDIR)/libswscale.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+PLATFORM_EXT   := android
+platform := android
+GLES = 1
+
+LOCAL_MODULE := retro
+
+include $(CORE_DIR)/libretro/Makefile.common
+
+COREFLAGS += -DINLINE="inline" -DPPSSPP -DUSE_FFMPEG -DMOBILE_DEVICE -DBAKE_IN_GIT -DDYNAREC -D__LIBRETRO__ -DUSING_GLES2 -D__STDC_CONSTANT_MACROS -DGLEW_NO_GLU -DNO_VULKAN $(INCFLAGS)
+LOCAL_SRC_FILES = $(SOURCES_CXX) $(SOURCES_C) $(ASMFILES)
+LOCAL_CPPFLAGS := -Wall -std=gnu++11 $(COREFLAGS) -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
+LOCAL_CFLAGS := -O2 -ffast-math -DANDROID $(COREFLAGS)
+LOCAL_LDLIBS += -lz -llog -lGLESv2 -lEGL -latomic
+LOCAL_STATIC_LIBRARIES += $(FFMPEGLIBS)
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/libretro/jni/Application.mk b/libretro/jni/Application.mk
new file mode 100644
index 0000000000..4ed1b3142f
--- /dev/null
+++ b/libretro/jni/Application.mk
@@ -0,0 +1,5 @@
+NDK_TOOLCHAIN_VERSION ?= 4.8
+APP_ABI := armeabi-v7a,arm64-v8a,x86
+APP_STL := c++_static
+APP_GNUSTL_CPP_FEATURES := exceptions
+APP_PLATFORM := android-9
diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
new file mode 100644
index 0000000000..0759ffbd97
--- /dev/null
+++ b/libretro/libretro.cpp
@@ -0,0 +1,749 @@
+
+#include <cstring>
+#include <cassert>
+#include <thread>
+#include <atomic>
+#include <vector>
+
+#include "base/timeutil.h"
+#include "Common/ChunkFile.h"
+#include "Core/Config.h"
+#include "Core/Core.h"
+#include "Core/HLE/sceCtrl.h"
+#include "Core/HLE/sceUtility.h"
+#include "Core/HLE/__sceAudio.h"
+#include "Core/HW/MemoryStick.h"
+#include "Core/Host.h"
+#include "Core/System.h"
+#include "Log.h"
+#include "LogManager.h"
+#include "ConsoleListener.h"
+#include "file/vfs.h"
+#include "file/zip_read.h"
+#include "GPU/GPUState.h"
+#include "GPU/GPUInterface.h"
+#include "GPU/Common/FramebufferCommon.h"
+#include "GPU/Common/TextureScalerCommon.h"
+#include "input/input_state.h"
+#include "base/NativeApp.h"
+#include "thread/threadutil.h"
+
+#include "libretro/libretro.h"
+#include "libretro/LibretroGraphicsContext.h"
+
+#define DIR_SEP "/"
+#ifdef _WIN32
+#define DIR_SEP_CHRS "/\\"
+#else
+#define DIR_SEP_CHRS "/"
+#endif
+
+#define SAMPLERATE 44100
+
+namespace Libretro {
+LibretroGraphicsContext *ctx;
+retro_environment_t environ_cb;
+static retro_audio_sample_batch_t audio_batch_cb;
+static retro_input_poll_t input_poll_cb;
+static retro_input_state_t input_state_cb;
+} // namespace Libretro
+
+using namespace Libretro;
+
+class LibretroHost : public Host {
+public:
+	LibretroHost() {}
+	bool InitGraphics(std::string *error_message, GraphicsContext **ctx) override { return true; }
+	void ShutdownGraphics() override {}
+	void InitSound() override {}
+	void UpdateSound() override {
+		extern int hostAttemptBlockSize;
+		const int blockSizeMax = 512;
+		static int16_t audio[blockSizeMax * 2];
+		assert(hostAttemptBlockSize <= blockSizeMax);
+
+		int samples = __AudioMix(audio, hostAttemptBlockSize, SAMPLERATE);
+		audio_batch_cb(audio, samples);
+	}
+	void ShutdownSound() override {}
+	bool IsDebuggingEnabled() override { return false; }
+	bool AttemptLoadSymbolMap() override { return false; }
+};
+
+class PrintfLogger : public LogListener {
+public:
+	PrintfLogger(retro_log_callback log) : log_(log.log) {}
+	void Log(const LogMessage &message) {
+		switch (message.level) {
+		case LogTypes::LVERBOSE:
+		case LogTypes::LDEBUG:
+			log_(RETRO_LOG_DEBUG, "[%s] %s", message.log, message.msg.c_str());
+			return;
+
+		case LogTypes::LERROR:
+			log_(RETRO_LOG_ERROR, "[%s] %s", message.log, message.msg.c_str());
+			return;
+
+		case LogTypes::LNOTICE:
+		case LogTypes::LWARNING:
+			log_(RETRO_LOG_WARN, "[%s] %s", message.log, message.msg.c_str());
+			return;
+
+		case LogTypes::LINFO:
+		default:
+			log_(RETRO_LOG_INFO, "[%s] %s", message.log, message.msg.c_str());
+			return;
+		}
+	}
+
+private:
+	retro_log_printf_t log_;
+};
+static PrintfLogger *printfLogger;
+
+template <typename T> class RetroOption {
+public:
+	RetroOption(const char *id, const char *name, std::initializer_list<std::pair<const char *, T>> list) : id_(id), name_(name), list_(list.begin(), list.end()) {}
+	RetroOption(const char *id, const char *name, std::initializer_list<const char *> list) : id_(id), name_(name) {
+		for (auto option : list)
+			list_.push_back({ option, (T)list_.size() });
+	}
+	RetroOption(const char *id, const char *name, T first, std::initializer_list<const char *> list) : id_(id), name_(name) {
+		for (auto option : list)
+			list_.push_back({ option, first + (int)list_.size() });
+	}
+	RetroOption(const char *id, const char *name, T first, int count, int step = 1) : id_(id), name_(name) {
+		for (T i = first; i < first + count; i += step)
+			list_.push_back({ std::to_string(i), i });
+	}
+	RetroOption(const char *id, const char *name, bool initial) : id_(id), name_(name) {
+		list_.push_back({ initial ? "enabled" : "disabled", initial });
+		list_.push_back({ !initial ? "enabled" : "disabled", !initial });
+	}
+	retro_variable GetOptions() {
+		if (options_.empty()) {
+			options_ = name_;
+			options_.push_back(';');
+			for (auto &option : list_) {
+				if (option.first == list_.begin()->first)
+					options_ += std::string(" ") + option.first;
+				else
+					options_ += std::string("|") + option.first;
+			}
+		}
+		return { id_, options_.c_str() };
+	}
+	bool Update(T *dest) {
+		retro_variable var{ id_ };
+		T val = list_.front().second;
+
+		if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
+			for (auto option : list_) {
+				if (option.first == var.value) {
+					val = option.second;
+					break;
+				}
+			}
+		}
+
+		if (*dest != val) {
+			*dest = val;
+			return true;
+		}
+
+		return false;
+	}
+
+private:
+	const char *id_;
+	const char *name_;
+	std::string options_;
+	std::vector<std::pair<std::string, T>> list_;
+};
+
+static RetroOption<CPUCore> ppsspp_cpu_core("ppsspp_cpu_core", "CPU Core", { { "jit", CPUCore::JIT }, { "IR jit", CPUCore::IR_JIT }, { "interpreter", CPUCore::INTERPRETER } });
+static RetroOption<int> ppsspp_locked_cpu_speed("ppsspp_locked_cpu_speed", "Locked CPU Speed", { { "off", 0 }, { "222MHz", 222 }, { "266MHz", 266 }, { "333MHz", 333 } });
+static RetroOption<int> ppsspp_language("ppsspp_language", "Language", { { "automatic", -1 }, { "english", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH }, { "japanese", PSP_SYSTEMPARAM_LANGUAGE_JAPANESE }, { "french", PSP_SYSTEMPARAM_LANGUAGE_FRENCH }, { "spanish", PSP_SYSTEMPARAM_LANGUAGE_SPANISH }, { "german", PSP_SYSTEMPARAM_LANGUAGE_GERMAN }, { "italian", PSP_SYSTEMPARAM_LANGUAGE_ITALIAN }, { "dutch", PSP_SYSTEMPARAM_LANGUAGE_DUTCH }, { "portuguese", PSP_SYSTEMPARAM_LANGUAGE_PORTUGUESE }, { "russian", PSP_SYSTEMPARAM_LANGUAGE_RUSSIAN }, { "korean", PSP_SYSTEMPARAM_LANGUAGE_KOREAN }, { "chinese_traditional", PSP_SYSTEMPARAM_LANGUAGE_CHINESE_TRADITIONAL }, { "chinese_simplified", PSP_SYSTEMPARAM_LANGUAGE_CHINESE_SIMPLIFIED } });
+static RetroOption<int> ppsspp_rendering_mode("ppsspp_rendering_mode", "Rendering Mode", { { "buffered", FB_BUFFERED_MODE }, { "nonbuffered", FB_NON_BUFFERED_MODE } });
+static RetroOption<bool> ppsspp_true_color("ppsspp_true_color", "True Color Depth", true);
+static RetroOption<bool> ppsspp_auto_frameskip("ppsspp_auto_frameskip", "Auto Frameskip", false);
+static RetroOption<int> ppsspp_frameskip("ppsspp_frameskip", "Frameskip", 0, 10);
+static RetroOption<int> ppsspp_force_max_fps("ppsspp_force_max_fps", "Force Max FPS", { { "disabled", 0 }, { "enabled", 60 } });
+static RetroOption<int> ppsspp_audio_latency("ppsspp_audio_latency", "Audio latency", { "low", "medium", "high" });
+static RetroOption<int> ppsspp_internal_resolution("ppsspp_internal_resolution", "Internal Resolution", 1, { "480x272", "960x544", "1440x816", "1920x1088", "2400x1360", "2880x1632", "3360x1904", "3840x2176", "4320x2448", "4800x2720" });
+static RetroOption<int> ppsspp_button_preference("ppsspp_button_preference", "Confirmation Button", { { "cross", PSP_SYSTEMPARAM_BUTTON_CROSS }, { "circle", PSP_SYSTEMPARAM_BUTTON_CIRCLE } });
+static RetroOption<bool> ppsspp_fast_memory("ppsspp_fast_memory", "Fast Memory (Speedhack)", true);
+static RetroOption<bool> ppsspp_block_transfer_gpu("ppsspp_block_transfer_gpu", "Block Transfer GPU", true);
+static RetroOption<int> ppsspp_texture_scaling_level("ppsspp_texture_scaling_level", "Texture Scaling Level", { { "1", 1 }, { "2", 2 }, { "3", 3 }, { "4", 4 }, { "5", 5 }, { "0", 0 } });
+static RetroOption<int> ppsspp_texture_scaling_type("ppsspp_texture_scaling_type", "Texture Scaling Type", { { "xbrz", TextureScalerCommon::XBRZ }, { "hybrid", TextureScalerCommon::HYBRID }, { "bicubic", TextureScalerCommon::BICUBIC }, { "hybrid_bicubic", TextureScalerCommon::HYBRID_BICUBIC } });
+static RetroOption<int> ppsspp_texture_anisotropic_filtering("ppsspp_texture_anisotropic_filtering", "Anisotropic Filtering", { "off", "1x", "2x", "4x", "8x", "16x" });
+static RetroOption<bool> ppsspp_texture_deposterize("ppsspp_texture_deposterize", "Texture Deposterize", false);
+static RetroOption<bool> ppsspp_gpu_hardware_transform("ppsspp_gpu_hardware_transform", "GPU Hardware T&L", true);
+static RetroOption<bool> ppsspp_vertex_cache("ppsspp_vertex_cache", "Vertex Cache (Speedhack)", true);
+static RetroOption<bool> ppsspp_separate_io_thread("ppsspp_separate_io_thread", "IO Threading", false);
+static RetroOption<bool> ppsspp_unsafe_func_replacements("ppsspp_unsafe_func_replacements", "Unsafe FuncReplacements", true);
+static RetroOption<bool> ppsspp_sound_speedhack("ppsspp_sound_speedhack", "Sound Speedhack", false);
+static RetroOption<bool> ppsspp_cheats("ppsspp_cheats", "Internal Cheats Support", false);
+
+void retro_set_environment(retro_environment_t cb) {
+	std::vector<retro_variable> vars;
+	vars.push_back(ppsspp_cpu_core.GetOptions());
+	vars.push_back(ppsspp_locked_cpu_speed.GetOptions());
+	vars.push_back(ppsspp_language.GetOptions());
+	vars.push_back(ppsspp_rendering_mode.GetOptions());
+	vars.push_back(ppsspp_true_color.GetOptions());
+	vars.push_back(ppsspp_auto_frameskip.GetOptions());
+	vars.push_back(ppsspp_frameskip.GetOptions());
+	vars.push_back(ppsspp_force_max_fps.GetOptions());
+	vars.push_back(ppsspp_audio_latency.GetOptions());
+	vars.push_back(ppsspp_internal_resolution.GetOptions());
+	vars.push_back(ppsspp_button_preference.GetOptions());
+	vars.push_back(ppsspp_fast_memory.GetOptions());
+	vars.push_back(ppsspp_block_transfer_gpu.GetOptions());
+	vars.push_back(ppsspp_texture_scaling_level.GetOptions());
+	vars.push_back(ppsspp_texture_scaling_type.GetOptions());
+	vars.push_back(ppsspp_texture_anisotropic_filtering.GetOptions());
+	vars.push_back(ppsspp_texture_deposterize.GetOptions());
+	vars.push_back(ppsspp_gpu_hardware_transform.GetOptions());
+	vars.push_back(ppsspp_vertex_cache.GetOptions());
+	vars.push_back(ppsspp_separate_io_thread.GetOptions());
+	vars.push_back(ppsspp_unsafe_func_replacements.GetOptions());
+	vars.push_back(ppsspp_sound_speedhack.GetOptions());
+	vars.push_back(ppsspp_cheats.GetOptions());
+	vars.push_back({});
+
+	environ_cb = cb;
+
+	cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars.data());
+}
+
+static int get_language_auto(void) {
+	retro_language val = RETRO_LANGUAGE_ENGLISH;
+	environ_cb(RETRO_ENVIRONMENT_GET_LANGUAGE, &val);
+
+	switch (val) {
+	default:
+	case RETRO_LANGUAGE_ENGLISH:
+		return PSP_SYSTEMPARAM_LANGUAGE_ENGLISH;
+	case RETRO_LANGUAGE_JAPANESE:
+		return PSP_SYSTEMPARAM_LANGUAGE_JAPANESE;
+	case RETRO_LANGUAGE_FRENCH:
+		return PSP_SYSTEMPARAM_LANGUAGE_FRENCH;
+	case RETRO_LANGUAGE_GERMAN:
+		return PSP_SYSTEMPARAM_LANGUAGE_GERMAN;
+	case RETRO_LANGUAGE_SPANISH:
+		return PSP_SYSTEMPARAM_LANGUAGE_SPANISH;
+	case RETRO_LANGUAGE_ITALIAN:
+		return PSP_SYSTEMPARAM_LANGUAGE_ITALIAN;
+	case RETRO_LANGUAGE_PORTUGUESE_BRAZIL:
+	case RETRO_LANGUAGE_PORTUGUESE_PORTUGAL:
+		return PSP_SYSTEMPARAM_LANGUAGE_PORTUGUESE;
+	case RETRO_LANGUAGE_RUSSIAN:
+		return PSP_SYSTEMPARAM_LANGUAGE_RUSSIAN;
+	case RETRO_LANGUAGE_DUTCH:
+		return PSP_SYSTEMPARAM_LANGUAGE_DUTCH;
+	case RETRO_LANGUAGE_KOREAN:
+		return PSP_SYSTEMPARAM_LANGUAGE_KOREAN;
+	case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
+		return PSP_SYSTEMPARAM_LANGUAGE_CHINESE_TRADITIONAL;
+	case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
+		return PSP_SYSTEMPARAM_LANGUAGE_CHINESE_SIMPLIFIED;
+	}
+}
+
+static void check_variables(CoreParameter &coreParam) {
+	bool updated = false;
+
+	if (coreState != CORE_POWERUP && environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && !updated)
+		return;
+
+	ppsspp_button_preference.Update(&g_Config.iButtonPreference);
+	ppsspp_fast_memory.Update(&g_Config.bFastMemory);
+	ppsspp_vertex_cache.Update(&g_Config.bVertexCache);
+	ppsspp_gpu_hardware_transform.Update(&g_Config.bHardwareTransform);
+	ppsspp_frameskip.Update(&g_Config.iFrameSkip);
+	ppsspp_audio_latency.Update(&g_Config.iAudioLatency);
+	ppsspp_true_color.Update(&g_Config.bTrueColor);
+	ppsspp_auto_frameskip.Update(&g_Config.bAutoFrameSkip);
+	ppsspp_block_transfer_gpu.Update(&g_Config.bBlockTransferGPU);
+	ppsspp_texture_anisotropic_filtering.Update(&g_Config.iAnisotropyLevel);
+	ppsspp_texture_deposterize.Update(&g_Config.bTexDeposterize);
+	ppsspp_separate_io_thread.Update(&g_Config.bSeparateIOThread);
+	ppsspp_unsafe_func_replacements.Update(&g_Config.bFuncReplacements);
+	ppsspp_sound_speedhack.Update(&g_Config.bSoundSpeedHack);
+	ppsspp_cheats.Update(&g_Config.bEnableCheats);
+	ppsspp_locked_cpu_speed.Update(&g_Config.iLockedCPUSpeed);
+	ppsspp_rendering_mode.Update(&g_Config.iRenderingMode);
+	ppsspp_force_max_fps.Update(&g_Config.iForceMaxEmulatedFPS);
+	ppsspp_cpu_core.Update((CPUCore *)&g_Config.iCpuCore);
+
+	ppsspp_language.Update(&g_Config.iLanguage);
+	if (g_Config.iLanguage < 0) {
+		g_Config.iLanguage = get_language_auto();
+	}
+
+	if (ppsspp_internal_resolution.Update(&g_Config.iInternalResolution)) {
+		coreParam.pixelWidth = coreParam.renderWidth = g_Config.iInternalResolution * 480;
+		coreParam.pixelHeight = coreParam.renderHeight = g_Config.iInternalResolution * 272;
+		if (gpu) {
+			retro_system_av_info av_info;
+			retro_get_system_av_info(&av_info);
+			environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &av_info);
+			gpu->Resized();
+		}
+	}
+
+	if (ppsspp_texture_scaling_type.Update(&g_Config.iTexScalingType) && gpu) {
+		gpu->ClearCacheNextFrame();
+	}
+
+	if (ppsspp_texture_scaling_level.Update(&g_Config.iTexScalingLevel) && gpu) {
+		gpu->ClearCacheNextFrame();
+	}
+}
+
+void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb) { audio_batch_cb = cb; }
+void retro_set_audio_sample(retro_audio_sample_t cb) { (void)cb; }
+void retro_set_input_poll(retro_input_poll_t cb) { input_poll_cb = cb; }
+void retro_set_input_state(retro_input_state_t cb) { input_state_cb = cb; }
+
+void retro_init(void) {
+#if 0
+	g_Config.Load("");
+#endif
+
+	g_Config.bEnableLogging = true;
+	g_Config.bFrameSkipUnthrottle = false;
+	g_Config.bMemStickInserted = PSP_MEMORYSTICK_STATE_INSERTED;
+	g_Config.iGlobalVolume = VOLUME_MAX - 1;
+	g_Config.bEnableSound = true;
+	g_Config.bAudioResampler = false;
+	g_Config.iCwCheatRefreshRate = 60;
+
+	LogManager::Init();
+
+	host = new LibretroHost;
+
+	struct retro_log_callback log;
+	if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log)) {
+		printfLogger = new PrintfLogger(log);
+		LogManager *logman = LogManager::GetInstance();
+		logman->RemoveListener(logman->GetConsoleListener());
+		logman->RemoveListener(logman->GetDebuggerListener());
+		logman->ChangeFileLog(nullptr);
+		logman->AddListener(printfLogger);
+#if 1
+		logman->SetAllLogLevels(LogTypes::LINFO);
+#endif
+	}
+}
+
+void retro_deinit(void) {
+	LogManager::Shutdown();
+
+	delete printfLogger;
+	printfLogger = nullptr;
+
+	delete host;
+	host = nullptr;
+}
+
+void retro_set_controller_port_device(unsigned port, unsigned device) {
+	(void)port;
+	(void)device;
+}
+
+void retro_get_system_info(struct retro_system_info *info) {
+	*info = {};
+	info->library_name = "PPSSPP";
+	info->library_version = PPSSPP_GIT_VERSION;
+	info->need_fullpath = true;
+	info->valid_extensions = "elf|iso|cso|prx|pbp";
+}
+
+void retro_get_system_av_info(struct retro_system_av_info *info) {
+	*info = {};
+	info->timing.fps = 60.0f / 1.001f;
+	info->timing.sample_rate = SAMPLERATE;
+
+	info->geometry.base_width = g_Config.iInternalResolution * 480;
+	info->geometry.base_height = g_Config.iInternalResolution * 272;
+	info->geometry.max_width = g_Config.iInternalResolution * 480;
+	info->geometry.max_height = g_Config.iInternalResolution * 272;
+	info->geometry.aspect_ratio = 16.0 / 9.0;
+}
+
+unsigned retro_api_version(void) { return RETRO_API_VERSION; }
+namespace Libretro {
+
+bool useEmuThread = false;
+std::atomic<EmuThreadState> emuThreadState(EmuThreadState::DISABLED);
+
+static std::thread emuThread;
+static void EmuFrame() {
+	ctx->SetRenderTarget();
+	if (ctx->GetDrawContext()) {
+		ctx->GetDrawContext()->BeginFrame();
+	}
+
+	gpu->BeginHostFrame();
+
+	coreState = CORE_RUNNING;
+	PSP_RunLoopUntil(UINT64_MAX);
+
+	gpu->EndHostFrame();
+
+	if (ctx->GetDrawContext()) {
+		ctx->GetDrawContext()->EndFrame();
+	}
+}
+
+static void EmuThreadFunc() {
+	setCurrentThreadName("Emu");
+
+	while (true) {
+		switch ((EmuThreadState)emuThreadState) {
+		case EmuThreadState::START_REQUESTED:
+			emuThreadState = EmuThreadState::RUNNING;
+			/* fallthrough */
+		case EmuThreadState::RUNNING:
+			EmuFrame();
+			break;
+		case EmuThreadState::PAUSE_REQUESTED:
+			emuThreadState = EmuThreadState::PAUSED;
+			/* fallthrough */
+		case EmuThreadState::PAUSED:
+			sleep_ms(1);
+			break;
+		default:
+		case EmuThreadState::QUIT_REQUESTED:
+			emuThreadState = EmuThreadState::STOPPED;
+			ctx->StopThread();
+			return;
+		}
+	}
+}
+
+void EmuThreadStart() {
+	bool wasPaused = emuThreadState == EmuThreadState::PAUSED;
+	emuThreadState = EmuThreadState::START_REQUESTED;
+
+	if (!wasPaused) {
+		ctx->ThreadStart();
+		emuThread = std::thread(&EmuThreadFunc);
+	}
+}
+
+void EmuThreadStop() {
+	if (emuThreadState != EmuThreadState::RUNNING) {
+		return;
+	}
+
+	emuThreadState = EmuThreadState::QUIT_REQUESTED;
+
+	while (ctx->ThreadFrame()) {
+		// Need to keep eating frames to allow the EmuThread to exit correctly.
+		continue;
+	}
+	emuThread.join();
+	emuThread = std::thread();
+	ctx->ThreadEnd();
+}
+
+void EmuThreadPause() {
+	if (emuThreadState != EmuThreadState::RUNNING) {
+		return;
+	}
+	emuThreadState = EmuThreadState::PAUSE_REQUESTED;
+	ctx->ThreadFrame();
+	while (emuThreadState != EmuThreadState::PAUSED) {
+		sleep_ms(1);
+	}
+}
+
+} // namespace Libretro
+
+bool retro_load_game(const struct retro_game_info *game) {
+	struct retro_input_descriptor desc[] = {
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "Cross" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "Circle" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "Triangle" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "Square" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "L" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
+		{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" },
+		{ 0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Analog X" },
+		{ 0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Analog Y" },
+		{ 0 },
+	};
+	environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);
+
+	enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888;
+	if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) {
+		ERROR_LOG(SYSTEM, "XRGB8888 is not supported.\n");
+		return false;
+	}
+
+	const char *nickname = NULL;
+	if (environ_cb(RETRO_ENVIRONMENT_GET_USERNAME, &nickname) && nickname) {
+		g_Config.sNickName = std::string(nickname);
+	}
+
+	const char *dir_ptr = NULL;
+	static std::string retro_base_dir;
+	static std::string retro_save_dir;
+
+	if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir_ptr) && dir_ptr) {
+		retro_base_dir = dir_ptr;
+		// Make sure that we don't have any lingering slashes, etc, as they break Windows.
+		size_t last = retro_base_dir.find_last_not_of(DIR_SEP_CHRS);
+		if (last != std::string::npos)
+			last++;
+
+		retro_base_dir = retro_base_dir.substr(0, last) + DIR_SEP;
+	}
+
+	if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir_ptr) && dir_ptr) {
+		retro_save_dir = dir_ptr;
+		// Make sure that we don't have any lingering slashes, etc, as they break Windows.
+		size_t last = retro_save_dir.find_last_not_of(DIR_SEP_CHRS);
+		if (last != std::string::npos)
+			last++;
+
+		retro_save_dir = retro_save_dir.substr(0, last) + DIR_SEP;
+	}
+
+	if (retro_base_dir.empty()) {
+		retro_base_dir = File::GetDir(game->path);
+	}
+
+	retro_base_dir += "PPSSPP" DIR_SEP;
+
+	if (retro_save_dir.empty()) {
+		retro_save_dir = File::GetDir(game->path);
+	}
+
+	g_Config.currentDirectory = retro_base_dir;
+	g_Config.externalDirectory = retro_base_dir;
+	g_Config.memStickDirectory = retro_save_dir;
+	g_Config.flash0Directory = retro_base_dir + "flash0" DIR_SEP;
+	g_Config.internalDataDirectory = retro_base_dir;
+
+	VFSRegister("", new DirectoryAssetReader(retro_base_dir.c_str()));
+
+	coreState = CORE_POWERUP;
+	ctx = LibretroGraphicsContext::CreateGraphicsContext();
+	INFO_LOG(SYSTEM, "Using %s backend", ctx->Ident());
+
+	Core_SetGraphicsContext(ctx);
+	SetGPUBackend((GPUBackend)g_Config.iGPUBackend);
+
+	useEmuThread = ctx->GetGPUCore() == GPUCORE_GLES;
+
+	CoreParameter coreParam = {};
+	coreParam.enableSound = true;
+	coreParam.fileToStart = std::string(game->path);
+	coreParam.mountIso = "";
+	coreParam.startPaused = false;
+	coreParam.printfEmuLog = true;
+	coreParam.headLess = true;
+	coreParam.unthrottle = true;
+	coreParam.graphicsContext = ctx;
+	coreParam.gpuCore = ctx->GetGPUCore();
+	coreParam.cpuCore = CPUCore::JIT;
+	check_variables(coreParam);
+
+#if 0
+	g_Config.bVertexDecoderJit = (coreParam.cpuCore == CPU_JIT) ? true : false;
+#endif
+
+	std::string error_string;
+	if (!PSP_InitStart(coreParam, &error_string)) {
+		ERROR_LOG(BOOT, "%s", error_string.c_str());
+		return false;
+	}
+
+	return true;
+}
+
+void retro_unload_game(void) {
+	if (Libretro::useEmuThread) {
+		Libretro::EmuThreadStop();
+	}
+
+	PSP_Shutdown();
+	VFSShutdown();
+
+	delete ctx;
+	ctx = nullptr;
+	PSP_CoreParameter().graphicsContext = nullptr;
+}
+
+void retro_reset(void) {
+	std::string error_string;
+
+	PSP_Shutdown();
+
+#if 0
+	coreState = CORE_POWERUP;
+	if (!PSP_InitStart(PSP_CoreParameter(), &error_string))
+	{
+		ERROR_LOG(BOOT, "%s", error_string.c_str());
+		environ_cb(RETRO_ENVIRONMENT_SHUTDOWN, nullptr);
+	}
+#else
+	if (!PSP_Init(PSP_CoreParameter(), &error_string)) {
+		ERROR_LOG(BOOT, "%s", error_string.c_str());
+		environ_cb(RETRO_ENVIRONMENT_SHUTDOWN, nullptr);
+	}
+#endif
+}
+
+static void retro_input(void) {
+	// clang-format off
+	static struct
+	{
+		u32 retro;
+		u32 sceCtrl;
+	} map[] = {
+		{ RETRO_DEVICE_ID_JOYPAD_UP,     CTRL_UP },
+		{ RETRO_DEVICE_ID_JOYPAD_DOWN,   CTRL_DOWN },
+		{ RETRO_DEVICE_ID_JOYPAD_LEFT,   CTRL_LEFT },
+		{ RETRO_DEVICE_ID_JOYPAD_RIGHT,  CTRL_RIGHT },
+		{ RETRO_DEVICE_ID_JOYPAD_X,      CTRL_TRIANGLE },
+		{ RETRO_DEVICE_ID_JOYPAD_A,      CTRL_CIRCLE },
+		{ RETRO_DEVICE_ID_JOYPAD_B,      CTRL_CROSS },
+		{ RETRO_DEVICE_ID_JOYPAD_Y,      CTRL_SQUARE },
+		{ RETRO_DEVICE_ID_JOYPAD_L,      CTRL_LTRIGGER },
+		{ RETRO_DEVICE_ID_JOYPAD_R,      CTRL_RTRIGGER },
+		{ RETRO_DEVICE_ID_JOYPAD_START,  CTRL_START },
+		{ RETRO_DEVICE_ID_JOYPAD_SELECT, CTRL_SELECT },
+	};
+	// clang-format on
+
+	input_poll_cb();
+
+	for (int i = 0; i < sizeof(map) / sizeof(*map); i++) {
+		if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, map[i].retro)) {
+			__CtrlButtonDown(map[i].sceCtrl);
+		} else {
+			__CtrlButtonUp(map[i].sceCtrl);
+		}
+	}
+
+	__CtrlSetAnalogX(input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 32768.0f);
+	__CtrlSetAnalogY(input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / -32768.0f);
+}
+
+void retro_run(void) {
+	if (PSP_IsIniting()) {
+		std::string error_string;
+#if 0
+		if (!PSP_InitUpdate(&error_string))
+		{
+			graphics_context->SwapBuffers();
+			return;
+		}
+#else
+		while (!PSP_InitUpdate(&error_string)) {
+			sleep_ms(4);
+		}
+#endif
+
+		if (!PSP_IsInited()) {
+			ERROR_LOG(BOOT, "%s", error_string.c_str());
+			environ_cb(RETRO_ENVIRONMENT_SHUTDOWN, nullptr);
+			return;
+		}
+	}
+
+	check_variables(PSP_CoreParameter());
+
+	retro_input();
+
+	if (useEmuThread) {
+		if (emuThreadState != EmuThreadState::RUNNING) {
+			EmuThreadStart();
+		}
+
+		if (!ctx->ThreadFrame()) {
+			return;
+		}
+	} else {
+		EmuFrame();
+	}
+
+	ctx->SwapBuffers();
+}
+
+unsigned retro_get_region(void) { return RETRO_REGION_NTSC; }
+
+bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t num) {
+	(void)type;
+	(void)info;
+	(void)num;
+	return false;
+}
+
+namespace SaveState {
+struct SaveStart {
+	void DoState(PointerWrap &p);
+};
+} // namespace SaveState
+
+size_t retro_serialize_size(void) {
+	SaveState::SaveStart state;
+	return (CChunkFileReader::MeasurePtr(state) + 0x800000) & ~0x7FFFFF;
+}
+
+bool retro_serialize(void *data, size_t size) {
+	SaveState::SaveStart state;
+	assert(CChunkFileReader::MeasurePtr(state) <= size);
+	return CChunkFileReader::SavePtr((u8 *)data, state) == CChunkFileReader::ERROR_NONE;
+}
+
+bool retro_unserialize(const void *data, size_t size) {
+	SaveState::SaveStart state;
+	return CChunkFileReader::LoadPtr((u8 *)data, state) == CChunkFileReader::ERROR_NONE;
+}
+
+void *retro_get_memory_data(unsigned id) {
+	(void)id;
+	return NULL;
+}
+
+size_t retro_get_memory_size(unsigned id) {
+	(void)id;
+	return 0;
+}
+
+void retro_cheat_reset(void) {}
+
+void retro_cheat_set(unsigned index, bool enabled, const char *code) {
+	(void)index;
+	(void)enabled;
+	(void)code;
+}
+
+int System_GetPropertyInt(SystemProperty prop) {
+	switch (prop) {
+	case SYSPROP_AUDIO_SAMPLE_RATE:
+		return SAMPLERATE;
+	case SYSPROP_DISPLAY_REFRESH_RATE:
+		return 60000;
+	default:
+		return -1;
+	}
+}
+
+std::string System_GetProperty(SystemProperty prop) { return ""; }
+void System_SendMessage(const char *command, const char *parameter) {}
+void NativeUpdate() {}
+void NativeRender(GraphicsContext *graphicsContext) {}
+void NativeResized() {}
+bool System_InputBoxGetWString(const wchar_t *title, const std::wstring &defaultvalue, std::wstring &outvalue) { return false; }
diff --git a/libretro/libretro.def b/libretro/libretro.def
new file mode 100644
index 0000000000..caf1ae005b
--- /dev/null
+++ b/libretro/libretro.def
@@ -0,0 +1,27 @@
+LIBRARY "libretro"
+EXPORTS
+retro_set_environment
+retro_set_video_refresh
+retro_set_audio_sample
+retro_set_audio_sample_batch
+retro_set_input_poll
+retro_set_input_state
+retro_init
+retro_deinit
+retro_api_version
+retro_get_system_info
+retro_get_system_av_info
+retro_set_controller_port_device
+retro_reset
+retro_run
+retro_serialize_size
+retro_serialize
+retro_unserialize
+retro_cheat_reset
+retro_cheat_set
+retro_load_game
+retro_load_game_special
+retro_unload_game
+retro_get_region
+retro_get_memory_data
+retro_get_memory_size
diff --git a/libretro/libretro.h b/libretro/libretro.h
new file mode 100644
index 0000000000..bfe832c202
--- /dev/null
+++ b/libretro/libretro.h
@@ -0,0 +1,2360 @@
+/* Copyright (C) 2010-2017 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this libretro API header (libretro.h).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef LIBRETRO_H__
+#define LIBRETRO_H__
+
+#include <stdint.h>
+#include <stddef.h>
+#include <limits.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef __cplusplus
+#if defined(_MSC_VER) && _MSC_VER < 1800 && !defined(SN_TARGET_PS3)
+/* Hack applied for MSVC when compiling in C89 mode
+ * as it isn't C99-compliant. */
+#define bool unsigned char
+#define true 1
+#define false 0
+#else
+#include <stdbool.h>
+#endif
+#endif
+
+#ifndef RETRO_CALLCONV
+#  if defined(__GNUC__) && defined(__i386__) && !defined(__x86_64__)
+#    define RETRO_CALLCONV __attribute__((cdecl))
+#  elif defined(_MSC_VER) && defined(_M_X86) && !defined(_M_X64)
+#    define RETRO_CALLCONV __cdecl
+#  else
+#    define RETRO_CALLCONV /* all other platforms only have one calling convention each */
+#  endif
+#endif
+
+#ifndef RETRO_API
+#  if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#    ifdef RETRO_IMPORT_SYMBOLS
+#      ifdef __GNUC__
+#        define RETRO_API RETRO_CALLCONV __attribute__((__dllimport__))
+#      else
+#        define RETRO_API RETRO_CALLCONV __declspec(dllimport)
+#      endif
+#    else
+#      ifdef __GNUC__
+#        define RETRO_API RETRO_CALLCONV __attribute__((__dllexport__))
+#      else
+#        define RETRO_API RETRO_CALLCONV __declspec(dllexport)
+#      endif
+#    endif
+#  else
+#      if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__)
+#        define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default")))
+#      else
+#        define RETRO_API RETRO_CALLCONV
+#      endif
+#  endif
+#endif
+
+/* Used for checking API/ABI mismatches that can break libretro
+ * implementations.
+ * It is not incremented for compatible changes to the API.
+ */
+#define RETRO_API_VERSION         1
+
+/*
+ * Libretro's fundamental device abstractions.
+ *
+ * Libretro's input system consists of some standardized device types,
+ * such as a joypad (with/without analog), mouse, keyboard, lightgun
+ * and a pointer.
+ *
+ * The functionality of these devices are fixed, and individual cores
+ * map their own concept of a controller to libretro's abstractions.
+ * This makes it possible for frontends to map the abstract types to a
+ * real input device, and not having to worry about binding input
+ * correctly to arbitrary controller layouts.
+ */
+
+#define RETRO_DEVICE_TYPE_SHIFT         8
+#define RETRO_DEVICE_MASK               ((1 << RETRO_DEVICE_TYPE_SHIFT) - 1)
+#define RETRO_DEVICE_SUBCLASS(base, id) (((id + 1) << RETRO_DEVICE_TYPE_SHIFT) | base)
+
+/* Input disabled. */
+#define RETRO_DEVICE_NONE         0
+
+/* The JOYPAD is called RetroPad. It is essentially a Super Nintendo
+ * controller, but with additional L2/R2/L3/R3 buttons, similar to a
+ * PS1 DualShock. */
+#define RETRO_DEVICE_JOYPAD       1
+
+/* The mouse is a simple mouse, similar to Super Nintendo's mouse.
+ * X and Y coordinates are reported relatively to last poll (poll callback).
+ * It is up to the libretro implementation to keep track of where the mouse
+ * pointer is supposed to be on the screen.
+ * The frontend must make sure not to interfere with its own hardware
+ * mouse pointer.
+ */
+#define RETRO_DEVICE_MOUSE        2
+
+/* KEYBOARD device lets one poll for raw key pressed.
+ * It is poll based, so input callback will return with the current
+ * pressed state.
+ * For event/text based keyboard input, see
+ * RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK.
+ */
+#define RETRO_DEVICE_KEYBOARD     3
+
+/* LIGHTGUN device is similar to Guncon-2 for PlayStation 2.
+ * It reports X/Y coordinates in screen space (similar to the pointer)
+ * in the range [-0x8000, 0x7fff] in both axes, with zero being center.
+ * As well as reporting on/off screen state. It features a trigger,
+ * start/select buttons, auxiliary action buttons and a
+ * directional pad. A forced off-screen shot can be requested for
+ * auto-reloading function in some games.
+ */
+#define RETRO_DEVICE_LIGHTGUN     4
+
+/* The ANALOG device is an extension to JOYPAD (RetroPad).
+ * Similar to DualShock2 it adds two analog sticks and all buttons can
+ * be analog. This is treated as a separate device type as it returns
+ * axis values in the full analog range of [-0x8000, 0x7fff].
+ * Positive X axis is right. Positive Y axis is down.
+ * Buttons are returned in the range [0, 0x7fff].
+ * Only use ANALOG type when polling for analog values.
+ */
+#define RETRO_DEVICE_ANALOG       5
+
+/* Abstracts the concept of a pointing mechanism, e.g. touch.
+ * This allows libretro to query in absolute coordinates where on the
+ * screen a mouse (or something similar) is being placed.
+ * For a touch centric device, coordinates reported are the coordinates
+ * of the press.
+ *
+ * Coordinates in X and Y are reported as:
+ * [-0x7fff, 0x7fff]: -0x7fff corresponds to the far left/top of the screen,
+ * and 0x7fff corresponds to the far right/bottom of the screen.
+ * The "screen" is here defined as area that is passed to the frontend and
+ * later displayed on the monitor.
+ *
+ * The frontend is free to scale/resize this screen as it sees fit, however,
+ * (X, Y) = (-0x7fff, -0x7fff) will correspond to the top-left pixel of the
+ * game image, etc.
+ *
+ * To check if the pointer coordinates are valid (e.g. a touch display
+ * actually being touched), PRESSED returns 1 or 0.
+ *
+ * If using a mouse on a desktop, PRESSED will usually correspond to the
+ * left mouse button, but this is a frontend decision.
+ * PRESSED will only return 1 if the pointer is inside the game screen.
+ *
+ * For multi-touch, the index variable can be used to successively query
+ * more presses.
+ * If index = 0 returns true for _PRESSED, coordinates can be extracted
+ * with _X, _Y for index = 0. One can then query _PRESSED, _X, _Y with
+ * index = 1, and so on.
+ * Eventually _PRESSED will return false for an index. No further presses
+ * are registered at this point. */
+#define RETRO_DEVICE_POINTER      6
+
+/* Buttons for the RetroPad (JOYPAD).
+ * The placement of these is equivalent to placements on the
+ * Super Nintendo controller.
+ * L2/R2/L3/R3 buttons correspond to the PS1 DualShock.
+ * Also used as id values for RETRO_DEVICE_INDEX_ANALOG_BUTTON */
+#define RETRO_DEVICE_ID_JOYPAD_B        0
+#define RETRO_DEVICE_ID_JOYPAD_Y        1
+#define RETRO_DEVICE_ID_JOYPAD_SELECT   2
+#define RETRO_DEVICE_ID_JOYPAD_START    3
+#define RETRO_DEVICE_ID_JOYPAD_UP       4
+#define RETRO_DEVICE_ID_JOYPAD_DOWN     5
+#define RETRO_DEVICE_ID_JOYPAD_LEFT     6
+#define RETRO_DEVICE_ID_JOYPAD_RIGHT    7
+#define RETRO_DEVICE_ID_JOYPAD_A        8
+#define RETRO_DEVICE_ID_JOYPAD_X        9
+#define RETRO_DEVICE_ID_JOYPAD_L       10
+#define RETRO_DEVICE_ID_JOYPAD_R       11
+#define RETRO_DEVICE_ID_JOYPAD_L2      12
+#define RETRO_DEVICE_ID_JOYPAD_R2      13
+#define RETRO_DEVICE_ID_JOYPAD_L3      14
+#define RETRO_DEVICE_ID_JOYPAD_R3      15
+
+/* Index / Id values for ANALOG device. */
+#define RETRO_DEVICE_INDEX_ANALOG_LEFT       0
+#define RETRO_DEVICE_INDEX_ANALOG_RIGHT      1
+#define RETRO_DEVICE_INDEX_ANALOG_BUTTON     2
+#define RETRO_DEVICE_ID_ANALOG_X             0
+#define RETRO_DEVICE_ID_ANALOG_Y             1
+
+/* Id values for MOUSE. */
+#define RETRO_DEVICE_ID_MOUSE_X                0
+#define RETRO_DEVICE_ID_MOUSE_Y                1
+#define RETRO_DEVICE_ID_MOUSE_LEFT             2
+#define RETRO_DEVICE_ID_MOUSE_RIGHT            3
+#define RETRO_DEVICE_ID_MOUSE_WHEELUP          4
+#define RETRO_DEVICE_ID_MOUSE_WHEELDOWN        5
+#define RETRO_DEVICE_ID_MOUSE_MIDDLE           6
+#define RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP    7
+#define RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN  8
+#define RETRO_DEVICE_ID_MOUSE_BUTTON_4         9
+#define RETRO_DEVICE_ID_MOUSE_BUTTON_5         10
+
+/* Id values for LIGHTGUN. */
+#define RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X        13 /*Absolute Position*/
+#define RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y        14 /*Absolute*/
+#define RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN    15 /*Status Check*/
+#define RETRO_DEVICE_ID_LIGHTGUN_TRIGGER          2
+#define RETRO_DEVICE_ID_LIGHTGUN_RELOAD          16 /*Forced off-screen shot*/
+#define RETRO_DEVICE_ID_LIGHTGUN_AUX_A            3
+#define RETRO_DEVICE_ID_LIGHTGUN_AUX_B            4
+#define RETRO_DEVICE_ID_LIGHTGUN_START            6
+#define RETRO_DEVICE_ID_LIGHTGUN_SELECT           7
+#define RETRO_DEVICE_ID_LIGHTGUN_AUX_C            8
+#define RETRO_DEVICE_ID_LIGHTGUN_DPAD_UP          9
+#define RETRO_DEVICE_ID_LIGHTGUN_DPAD_DOWN       10
+#define RETRO_DEVICE_ID_LIGHTGUN_DPAD_LEFT       11
+#define RETRO_DEVICE_ID_LIGHTGUN_DPAD_RIGHT      12
+/* deprecated */
+#define RETRO_DEVICE_ID_LIGHTGUN_X                0 /*Relative Position*/
+#define RETRO_DEVICE_ID_LIGHTGUN_Y                1 /*Relative*/
+#define RETRO_DEVICE_ID_LIGHTGUN_CURSOR           3 /*Use Aux:A*/
+#define RETRO_DEVICE_ID_LIGHTGUN_TURBO            4 /*Use Aux:B*/
+#define RETRO_DEVICE_ID_LIGHTGUN_PAUSE            5 /*Use Start*/
+
+/* Id values for POINTER. */
+#define RETRO_DEVICE_ID_POINTER_X         0
+#define RETRO_DEVICE_ID_POINTER_Y         1
+#define RETRO_DEVICE_ID_POINTER_PRESSED   2
+
+/* Returned from retro_get_region(). */
+#define RETRO_REGION_NTSC  0
+#define RETRO_REGION_PAL   1
+
+/* Id values for LANGUAGE */
+enum retro_language
+{
+   RETRO_LANGUAGE_ENGLISH             = 0,
+   RETRO_LANGUAGE_JAPANESE            = 1,
+   RETRO_LANGUAGE_FRENCH              = 2,
+   RETRO_LANGUAGE_SPANISH             = 3,
+   RETRO_LANGUAGE_GERMAN              = 4,
+   RETRO_LANGUAGE_ITALIAN             = 5,
+   RETRO_LANGUAGE_DUTCH               = 6,
+   RETRO_LANGUAGE_PORTUGUESE_BRAZIL   = 7,
+   RETRO_LANGUAGE_PORTUGUESE_PORTUGAL = 8,
+   RETRO_LANGUAGE_RUSSIAN             = 9,
+   RETRO_LANGUAGE_KOREAN              = 10,
+   RETRO_LANGUAGE_CHINESE_TRADITIONAL = 11,
+   RETRO_LANGUAGE_CHINESE_SIMPLIFIED  = 12,
+   RETRO_LANGUAGE_ESPERANTO           = 13,
+   RETRO_LANGUAGE_POLISH              = 14,
+   RETRO_LANGUAGE_VIETNAMESE          = 15,
+   RETRO_LANGUAGE_ARABIC              = 16,
+   RETRO_LANGUAGE_LAST,
+
+   /* Ensure sizeof(enum) == sizeof(int) */
+   RETRO_LANGUAGE_DUMMY          = INT_MAX
+};
+
+/* Passed to retro_get_memory_data/size().
+ * If the memory type doesn't apply to the
+ * implementation NULL/0 can be returned.
+ */
+#define RETRO_MEMORY_MASK        0xff
+
+/* Regular save RAM. This RAM is usually found on a game cartridge,
+ * backed up by a battery.
+ * If save game data is too complex for a single memory buffer,
+ * the SAVE_DIRECTORY (preferably) or SYSTEM_DIRECTORY environment
+ * callback can be used. */
+#define RETRO_MEMORY_SAVE_RAM    0
+
+/* Some games have a built-in clock to keep track of time.
+ * This memory is usually just a couple of bytes to keep track of time.
+ */
+#define RETRO_MEMORY_RTC         1
+
+/* System ram lets a frontend peek into a game systems main RAM. */
+#define RETRO_MEMORY_SYSTEM_RAM  2
+
+/* Video ram lets a frontend peek into a game systems video RAM (VRAM). */
+#define RETRO_MEMORY_VIDEO_RAM   3
+
+/* Keysyms used for ID in input state callback when polling RETRO_KEYBOARD. */
+enum retro_key
+{
+   RETROK_UNKNOWN        = 0,
+   RETROK_FIRST          = 0,
+   RETROK_BACKSPACE      = 8,
+   RETROK_TAB            = 9,
+   RETROK_CLEAR          = 12,
+   RETROK_RETURN         = 13,
+   RETROK_PAUSE          = 19,
+   RETROK_ESCAPE         = 27,
+   RETROK_SPACE          = 32,
+   RETROK_EXCLAIM        = 33,
+   RETROK_QUOTEDBL       = 34,
+   RETROK_HASH           = 35,
+   RETROK_DOLLAR         = 36,
+   RETROK_AMPERSAND      = 38,
+   RETROK_QUOTE          = 39,
+   RETROK_LEFTPAREN      = 40,
+   RETROK_RIGHTPAREN     = 41,
+   RETROK_ASTERISK       = 42,
+   RETROK_PLUS           = 43,
+   RETROK_COMMA          = 44,
+   RETROK_MINUS          = 45,
+   RETROK_PERIOD         = 46,
+   RETROK_SLASH          = 47,
+   RETROK_0              = 48,
+   RETROK_1              = 49,
+   RETROK_2              = 50,
+   RETROK_3              = 51,
+   RETROK_4              = 52,
+   RETROK_5              = 53,
+   RETROK_6              = 54,
+   RETROK_7              = 55,
+   RETROK_8              = 56,
+   RETROK_9              = 57,
+   RETROK_COLON          = 58,
+   RETROK_SEMICOLON      = 59,
+   RETROK_LESS           = 60,
+   RETROK_EQUALS         = 61,
+   RETROK_GREATER        = 62,
+   RETROK_QUESTION       = 63,
+   RETROK_AT             = 64,
+   RETROK_LEFTBRACKET    = 91,
+   RETROK_BACKSLASH      = 92,
+   RETROK_RIGHTBRACKET   = 93,
+   RETROK_CARET          = 94,
+   RETROK_UNDERSCORE     = 95,
+   RETROK_BACKQUOTE      = 96,
+   RETROK_a              = 97,
+   RETROK_b              = 98,
+   RETROK_c              = 99,
+   RETROK_d              = 100,
+   RETROK_e              = 101,
+   RETROK_f              = 102,
+   RETROK_g              = 103,
+   RETROK_h              = 104,
+   RETROK_i              = 105,
+   RETROK_j              = 106,
+   RETROK_k              = 107,
+   RETROK_l              = 108,
+   RETROK_m              = 109,
+   RETROK_n              = 110,
+   RETROK_o              = 111,
+   RETROK_p              = 112,
+   RETROK_q              = 113,
+   RETROK_r              = 114,
+   RETROK_s              = 115,
+   RETROK_t              = 116,
+   RETROK_u              = 117,
+   RETROK_v              = 118,
+   RETROK_w              = 119,
+   RETROK_x              = 120,
+   RETROK_y              = 121,
+   RETROK_z              = 122,
+   RETROK_LEFTBRACE      = 123,
+   RETROK_BAR            = 124,
+   RETROK_RIGHTBRACE     = 125,
+   RETROK_TILDE          = 126,
+   RETROK_DELETE         = 127,
+
+   RETROK_KP0            = 256,
+   RETROK_KP1            = 257,
+   RETROK_KP2            = 258,
+   RETROK_KP3            = 259,
+   RETROK_KP4            = 260,
+   RETROK_KP5            = 261,
+   RETROK_KP6            = 262,
+   RETROK_KP7            = 263,
+   RETROK_KP8            = 264,
+   RETROK_KP9            = 265,
+   RETROK_KP_PERIOD      = 266,
+   RETROK_KP_DIVIDE      = 267,
+   RETROK_KP_MULTIPLY    = 268,
+   RETROK_KP_MINUS       = 269,
+   RETROK_KP_PLUS        = 270,
+   RETROK_KP_ENTER       = 271,
+   RETROK_KP_EQUALS      = 272,
+
+   RETROK_UP             = 273,
+   RETROK_DOWN           = 274,
+   RETROK_RIGHT          = 275,
+   RETROK_LEFT           = 276,
+   RETROK_INSERT         = 277,
+   RETROK_HOME           = 278,
+   RETROK_END            = 279,
+   RETROK_PAGEUP         = 280,
+   RETROK_PAGEDOWN       = 281,
+
+   RETROK_F1             = 282,
+   RETROK_F2             = 283,
+   RETROK_F3             = 284,
+   RETROK_F4             = 285,
+   RETROK_F5             = 286,
+   RETROK_F6             = 287,
+   RETROK_F7             = 288,
+   RETROK_F8             = 289,
+   RETROK_F9             = 290,
+   RETROK_F10            = 291,
+   RETROK_F11            = 292,
+   RETROK_F12            = 293,
+   RETROK_F13            = 294,
+   RETROK_F14            = 295,
+   RETROK_F15            = 296,
+
+   RETROK_NUMLOCK        = 300,
+   RETROK_CAPSLOCK       = 301,
+   RETROK_SCROLLOCK      = 302,
+   RETROK_RSHIFT         = 303,
+   RETROK_LSHIFT         = 304,
+   RETROK_RCTRL          = 305,
+   RETROK_LCTRL          = 306,
+   RETROK_RALT           = 307,
+   RETROK_LALT           = 308,
+   RETROK_RMETA          = 309,
+   RETROK_LMETA          = 310,
+   RETROK_LSUPER         = 311,
+   RETROK_RSUPER         = 312,
+   RETROK_MODE           = 313,
+   RETROK_COMPOSE        = 314,
+
+   RETROK_HELP           = 315,
+   RETROK_PRINT          = 316,
+   RETROK_SYSREQ         = 317,
+   RETROK_BREAK          = 318,
+   RETROK_MENU           = 319,
+   RETROK_POWER          = 320,
+   RETROK_EURO           = 321,
+   RETROK_UNDO           = 322,
+
+   RETROK_LAST,
+
+   RETROK_DUMMY          = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */
+};
+
+enum retro_mod
+{
+   RETROKMOD_NONE       = 0x0000,
+
+   RETROKMOD_SHIFT      = 0x01,
+   RETROKMOD_CTRL       = 0x02,
+   RETROKMOD_ALT        = 0x04,
+   RETROKMOD_META       = 0x08,
+
+   RETROKMOD_NUMLOCK    = 0x10,
+   RETROKMOD_CAPSLOCK   = 0x20,
+   RETROKMOD_SCROLLOCK  = 0x40,
+
+   RETROKMOD_DUMMY = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */
+};
+
+/* If set, this call is not part of the public libretro API yet. It can
+ * change or be removed at any time. */
+#define RETRO_ENVIRONMENT_EXPERIMENTAL 0x10000
+/* Environment callback to be used internally in frontend. */
+#define RETRO_ENVIRONMENT_PRIVATE 0x20000
+
+/* Environment commands. */
+#define RETRO_ENVIRONMENT_SET_ROTATION  1  /* const unsigned * --
+                                            * Sets screen rotation of graphics.
+                                            * Is only implemented if rotation can be accelerated by hardware.
+                                            * Valid values are 0, 1, 2, 3, which rotates screen by 0, 90, 180,
+                                            * 270 degrees counter-clockwise respectively.
+                                            */
+#define RETRO_ENVIRONMENT_GET_OVERSCAN  2  /* bool * --
+                                            * Boolean value whether or not the implementation should use overscan,
+                                            * or crop away overscan.
+                                            */
+#define RETRO_ENVIRONMENT_GET_CAN_DUPE  3  /* bool * --
+                                            * Boolean value whether or not frontend supports frame duping,
+                                            * passing NULL to video frame callback.
+                                            */
+
+                                           /* Environ 4, 5 are no longer supported (GET_VARIABLE / SET_VARIABLES),
+                                            * and reserved to avoid possible ABI clash.
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_MESSAGE   6  /* const struct retro_message * --
+                                            * Sets a message to be displayed in implementation-specific manner
+                                            * for a certain amount of 'frames'.
+                                            * Should not be used for trivial messages, which should simply be
+                                            * logged via RETRO_ENVIRONMENT_GET_LOG_INTERFACE (or as a
+                                            * fallback, stderr).
+                                            */
+#define RETRO_ENVIRONMENT_SHUTDOWN      7  /* N/A (NULL) --
+                                            * Requests the frontend to shutdown.
+                                            * Should only be used if game has a specific
+                                            * way to shutdown the game from a menu item or similar.
+                                            */
+#define RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL 8
+                                           /* const unsigned * --
+                                            * Gives a hint to the frontend how demanding this implementation
+                                            * is on a system. E.g. reporting a level of 2 means
+                                            * this implementation should run decently on all frontends
+                                            * of level 2 and up.
+                                            *
+                                            * It can be used by the frontend to potentially warn
+                                            * about too demanding implementations.
+                                            *
+                                            * The levels are "floating".
+                                            *
+                                            * This function can be called on a per-game basis,
+                                            * as certain games an implementation can play might be
+                                            * particularly demanding.
+                                            * If called, it should be called in retro_load_game().
+                                            */
+#define RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY 9
+                                           /* const char ** --
+                                            * Returns the "system" directory of the frontend.
+                                            * This directory can be used to store system specific
+                                            * content such as BIOSes, configuration data, etc.
+                                            * The returned value can be NULL.
+                                            * If so, no such directory is defined,
+                                            * and it's up to the implementation to find a suitable directory.
+                                            *
+                                            * NOTE: Some cores used this folder also for "save" data such as
+                                            * memory cards, etc, for lack of a better place to put it.
+                                            * This is now discouraged, and if possible, cores should try to
+                                            * use the new GET_SAVE_DIRECTORY.
+                                            */
+#define RETRO_ENVIRONMENT_SET_PIXEL_FORMAT 10
+                                           /* const enum retro_pixel_format * --
+                                            * Sets the internal pixel format used by the implementation.
+                                            * The default pixel format is RETRO_PIXEL_FORMAT_0RGB1555.
+                                            * This pixel format however, is deprecated (see enum retro_pixel_format).
+                                            * If the call returns false, the frontend does not support this pixel
+                                            * format.
+                                            *
+                                            * This function should be called inside retro_load_game() or
+                                            * retro_get_system_av_info().
+                                            */
+#define RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS 11
+                                           /* const struct retro_input_descriptor * --
+                                            * Sets an array of retro_input_descriptors.
+                                            * It is up to the frontend to present this in a usable way.
+                                            * The array is terminated by retro_input_descriptor::description
+                                            * being set to NULL.
+                                            * This function can be called at any time, but it is recommended
+                                            * to call it as early as possible.
+                                            */
+#define RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK 12
+                                           /* const struct retro_keyboard_callback * --
+                                            * Sets a callback function used to notify core about keyboard events.
+                                            */
+#define RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE 13
+                                           /* const struct retro_disk_control_callback * --
+                                            * Sets an interface which frontend can use to eject and insert
+                                            * disk images.
+                                            * This is used for games which consist of multiple images and
+                                            * must be manually swapped out by the user (e.g. PSX).
+                                            */
+#define RETRO_ENVIRONMENT_SET_HW_RENDER 14
+                                           /* struct retro_hw_render_callback * --
+                                            * Sets an interface to let a libretro core render with
+                                            * hardware acceleration.
+                                            * Should be called in retro_load_game().
+                                            * If successful, libretro cores will be able to render to a
+                                            * frontend-provided framebuffer.
+                                            * The size of this framebuffer will be at least as large as
+                                            * max_width/max_height provided in get_av_info().
+                                            * If HW rendering is used, pass only RETRO_HW_FRAME_BUFFER_VALID or
+                                            * NULL to retro_video_refresh_t.
+                                            */
+#define RETRO_ENVIRONMENT_GET_VARIABLE 15
+                                           /* struct retro_variable * --
+                                            * Interface to acquire user-defined information from environment
+                                            * that cannot feasibly be supported in a multi-system way.
+                                            * 'key' should be set to a key which has already been set by
+                                            * SET_VARIABLES.
+                                            * 'data' will be set to a value or NULL.
+                                            */
+#define RETRO_ENVIRONMENT_SET_VARIABLES 16
+                                           /* const struct retro_variable * --
+                                            * Allows an implementation to signal the environment
+                                            * which variables it might want to check for later using
+                                            * GET_VARIABLE.
+                                            * This allows the frontend to present these variables to
+                                            * a user dynamically.
+                                            * This should be called as early as possible (ideally in
+                                            * retro_set_environment).
+                                            *
+                                            * 'data' points to an array of retro_variable structs
+                                            * terminated by a { NULL, NULL } element.
+                                            * retro_variable::key should be namespaced to not collide
+                                            * with other implementations' keys. E.g. A core called
+                                            * 'foo' should use keys named as 'foo_option'.
+                                            * retro_variable::value should contain a human readable
+                                            * description of the key as well as a '|' delimited list
+                                            * of expected values.
+                                            *
+                                            * The number of possible options should be very limited,
+                                            * i.e. it should be feasible to cycle through options
+                                            * without a keyboard.
+                                            *
+                                            * First entry should be treated as a default.
+                                            *
+                                            * Example entry:
+                                            * { "foo_option", "Speed hack coprocessor X; false|true" }
+                                            *
+                                            * Text before first ';' is description. This ';' must be
+                                            * followed by a space, and followed by a list of possible
+                                            * values split up with '|'.
+                                            *
+                                            * Only strings are operated on. The possible values will
+                                            * generally be displayed and stored as-is by the frontend.
+                                            */
+#define RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE 17
+                                           /* bool * --
+                                            * Result is set to true if some variables are updated by
+                                            * frontend since last call to RETRO_ENVIRONMENT_GET_VARIABLE.
+                                            * Variables should be queried with GET_VARIABLE.
+                                            */
+#define RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME 18
+                                           /* const bool * --
+                                            * If true, the libretro implementation supports calls to
+                                            * retro_load_game() with NULL as argument.
+                                            * Used by cores which can run without particular game data.
+                                            * This should be called within retro_set_environment() only.
+                                            */
+#define RETRO_ENVIRONMENT_GET_LIBRETRO_PATH 19
+                                           /* const char ** --
+                                            * Retrieves the absolute path from where this libretro
+                                            * implementation was loaded.
+                                            * NULL is returned if the libretro was loaded statically
+                                            * (i.e. linked statically to frontend), or if the path cannot be
+                                            * determined.
+                                            * Mostly useful in cooperation with SET_SUPPORT_NO_GAME as assets can
+                                            * be loaded without ugly hacks.
+                                            */
+
+                                           /* Environment 20 was an obsolete version of SET_AUDIO_CALLBACK.
+                                            * It was not used by any known core at the time,
+                                            * and was removed from the API. */
+#define RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK 22
+                                           /* const struct retro_audio_callback * --
+                                            * Sets an interface which is used to notify a libretro core about audio
+                                            * being available for writing.
+                                            * The callback can be called from any thread, so a core using this must
+                                            * have a thread safe audio implementation.
+                                            * It is intended for games where audio and video are completely
+                                            * asynchronous and audio can be generated on the fly.
+                                            * This interface is not recommended for use with emulators which have
+                                            * highly synchronous audio.
+                                            *
+                                            * The callback only notifies about writability; the libretro core still
+                                            * has to call the normal audio callbacks
+                                            * to write audio. The audio callbacks must be called from within the
+                                            * notification callback.
+                                            * The amount of audio data to write is up to the implementation.
+                                            * Generally, the audio callback will be called continously in a loop.
+                                            *
+                                            * Due to thread safety guarantees and lack of sync between audio and
+                                            * video, a frontend  can selectively disallow this interface based on
+                                            * internal configuration. A core using this interface must also
+                                            * implement the "normal" audio interface.
+                                            *
+                                            * A libretro core using SET_AUDIO_CALLBACK should also make use of
+                                            * SET_FRAME_TIME_CALLBACK.
+                                            */
+#define RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK 21
+                                           /* const struct retro_frame_time_callback * --
+                                            * Lets the core know how much time has passed since last
+                                            * invocation of retro_run().
+                                            * The frontend can tamper with the timing to fake fast-forward,
+                                            * slow-motion, frame stepping, etc.
+                                            * In this case the delta time will use the reference value
+                                            * in frame_time_callback..
+                                            */
+#define RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE 23
+                                           /* struct retro_rumble_interface * --
+                                            * Gets an interface which is used by a libretro core to set
+                                            * state of rumble motors in controllers.
+                                            * A strong and weak motor is supported, and they can be
+                                            * controlled indepedently.
+                                            */
+#define RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES 24
+                                           /* uint64_t * --
+                                            * Gets a bitmask telling which device type are expected to be
+                                            * handled properly in a call to retro_input_state_t.
+                                            * Devices which are not handled or recognized always return
+                                            * 0 in retro_input_state_t.
+                                            * Example bitmask: caps = (1 << RETRO_DEVICE_JOYPAD) | (1 << RETRO_DEVICE_ANALOG).
+                                            * Should only be called in retro_run().
+                                            */
+#define RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE (25 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* struct retro_sensor_interface * --
+                                            * Gets access to the sensor interface.
+                                            * The purpose of this interface is to allow
+                                            * setting state related to sensors such as polling rate,
+                                            * enabling/disable it entirely, etc.
+                                            * Reading sensor state is done via the normal
+                                            * input_state_callback API.
+                                            */
+#define RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE (26 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* struct retro_camera_callback * --
+                                            * Gets an interface to a video camera driver.
+                                            * A libretro core can use this interface to get access to a
+                                            * video camera.
+                                            * New video frames are delivered in a callback in same
+                                            * thread as retro_run().
+                                            *
+                                            * GET_CAMERA_INTERFACE should be called in retro_load_game().
+                                            *
+                                            * Depending on the camera implementation used, camera frames
+                                            * will be delivered as a raw framebuffer,
+                                            * or as an OpenGL texture directly.
+                                            *
+                                            * The core has to tell the frontend here which types of
+                                            * buffers can be handled properly.
+                                            * An OpenGL texture can only be handled when using a
+                                            * libretro GL core (SET_HW_RENDER).
+                                            * It is recommended to use a libretro GL core when
+                                            * using camera interface.
+                                            *
+                                            * The camera is not started automatically. The retrieved start/stop
+                                            * functions must be used to explicitly
+                                            * start and stop the camera driver.
+                                            */
+#define RETRO_ENVIRONMENT_GET_LOG_INTERFACE 27
+                                           /* struct retro_log_callback * --
+                                            * Gets an interface for logging. This is useful for
+                                            * logging in a cross-platform way
+                                            * as certain platforms cannot use stderr for logging.
+                                            * It also allows the frontend to
+                                            * show logging information in a more suitable way.
+                                            * If this interface is not used, libretro cores should
+                                            * log to stderr as desired.
+                                            */
+#define RETRO_ENVIRONMENT_GET_PERF_INTERFACE 28
+                                           /* struct retro_perf_callback * --
+                                            * Gets an interface for performance counters. This is useful
+                                            * for performance logging in a cross-platform way and for detecting
+                                            * architecture-specific features, such as SIMD support.
+                                            */
+#define RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE 29
+                                           /* struct retro_location_callback * --
+                                            * Gets access to the location interface.
+                                            * The purpose of this interface is to be able to retrieve
+                                            * location-based information from the host device,
+                                            * such as current latitude / longitude.
+                                            */
+#define RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY 30 /* Old name, kept for compatibility. */
+#define RETRO_ENVIRONMENT_GET_CORE_ASSETS_DIRECTORY 30
+                                           /* const char ** --
+                                            * Returns the "core assets" directory of the frontend.
+                                            * This directory can be used to store specific assets that the
+                                            * core relies upon, such as art assets,
+                                            * input data, etc etc.
+                                            * The returned value can be NULL.
+                                            * If so, no such directory is defined,
+                                            * and it's up to the implementation to find a suitable directory.
+                                            */
+#define RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY 31
+                                           /* const char ** --
+                                            * Returns the "save" directory of the frontend.
+                                            * This directory can be used to store SRAM, memory cards,
+                                            * high scores, etc, if the libretro core
+                                            * cannot use the regular memory interface (retro_get_memory_data()).
+                                            *
+                                            * NOTE: libretro cores used to check GET_SYSTEM_DIRECTORY for
+                                            * similar things before.
+                                            * They should still check GET_SYSTEM_DIRECTORY if they want to
+                                            * be backwards compatible.
+                                            * The path here can be NULL. It should only be non-NULL if the
+                                            * frontend user has set a specific save path.
+                                            */
+#define RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO 32
+                                           /* const struct retro_system_av_info * --
+                                            * Sets a new av_info structure. This can only be called from
+                                            * within retro_run().
+                                            * This should *only* be used if the core is completely altering the
+                                            * internal resolutions, aspect ratios, timings, sampling rate, etc.
+                                            * Calling this can require a full reinitialization of video/audio
+                                            * drivers in the frontend,
+                                            *
+                                            * so it is important to call it very sparingly, and usually only with
+                                            * the users explicit consent.
+                                            * An eventual driver reinitialize will happen so that video and
+                                            * audio callbacks
+                                            * happening after this call within the same retro_run() call will
+                                            * target the newly initialized driver.
+                                            *
+                                            * This callback makes it possible to support configurable resolutions
+                                            * in games, which can be useful to
+                                            * avoid setting the "worst case" in max_width/max_height.
+                                            *
+                                            * ***HIGHLY RECOMMENDED*** Do not call this callback every time
+                                            * resolution changes in an emulator core if it's
+                                            * expected to be a temporary change, for the reasons of possible
+                                            * driver reinitialization.
+                                            * This call is not a free pass for not trying to provide
+                                            * correct values in retro_get_system_av_info(). If you need to change
+                                            * things like aspect ratio or nominal width/height,
+                                            * use RETRO_ENVIRONMENT_SET_GEOMETRY, which is a softer variant
+                                            * of SET_SYSTEM_AV_INFO.
+                                            *
+                                            * If this returns false, the frontend does not acknowledge a
+                                            * changed av_info struct.
+                                            */
+#define RETRO_ENVIRONMENT_SET_PROC_ADDRESS_CALLBACK 33
+                                           /* const struct retro_get_proc_address_interface * --
+                                            * Allows a libretro core to announce support for the
+                                            * get_proc_address() interface.
+                                            * This interface allows for a standard way to extend libretro where
+                                            * use of environment calls are too indirect,
+                                            * e.g. for cases where the frontend wants to call directly into the core.
+                                            *
+                                            * If a core wants to expose this interface, SET_PROC_ADDRESS_CALLBACK
+                                            * **MUST** be called from within retro_set_environment().
+                                            */
+#define RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO 34
+                                           /* const struct retro_subsystem_info * --
+                                            * This environment call introduces the concept of libretro "subsystems".
+                                            * A subsystem is a variant of a libretro core which supports
+                                            * different kinds of games.
+                                            * The purpose of this is to support e.g. emulators which might
+                                            * have special needs, e.g. Super Nintendo's Super GameBoy, Sufami Turbo.
+                                            * It can also be used to pick among subsystems in an explicit way
+                                            * if the libretro implementation is a multi-system emulator itself.
+                                            *
+                                            * Loading a game via a subsystem is done with retro_load_game_special(),
+                                            * and this environment call allows a libretro core to expose which
+                                            * subsystems are supported for use with retro_load_game_special().
+                                            * A core passes an array of retro_game_special_info which is terminated
+                                            * with a zeroed out retro_game_special_info struct.
+                                            *
+                                            * If a core wants to use this functionality, SET_SUBSYSTEM_INFO
+                                            * **MUST** be called from within retro_set_environment().
+                                            */
+#define RETRO_ENVIRONMENT_SET_CONTROLLER_INFO 35
+                                           /* const struct retro_controller_info * --
+                                            * This environment call lets a libretro core tell the frontend
+                                            * which controller types are recognized in calls to
+                                            * retro_set_controller_port_device().
+                                            *
+                                            * Some emulators such as Super Nintendo
+                                            * support multiple lightgun types which must be specifically
+                                            * selected from.
+                                            * It is therefore sometimes necessary for a frontend to be able
+                                            * to tell the core about a special kind of input device which is
+                                            * not covered by the libretro input API.
+                                            *
+                                            * In order for a frontend to understand the workings of an input device,
+                                            * it must be a specialized type
+                                            * of the generic device types already defined in the libretro API.
+                                            *
+                                            * Which devices are supported can vary per input port.
+                                            * The core must pass an array of const struct retro_controller_info which
+                                            * is terminated with a blanked out struct. Each element of the struct
+                                            * corresponds to an ascending port index to
+                                            * retro_set_controller_port_device().
+                                            * Even if special device types are set in the libretro core,
+                                            * libretro should only poll input based on the base input device types.
+                                            */
+#define RETRO_ENVIRONMENT_SET_MEMORY_MAPS (36 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* const struct retro_memory_map * --
+                                            * This environment call lets a libretro core tell the frontend
+                                            * about the memory maps this core emulates.
+                                            * This can be used to implement, for example, cheats in a core-agnostic way.
+                                            *
+                                            * Should only be used by emulators; it doesn't make much sense for
+                                            * anything else.
+                                            * It is recommended to expose all relevant pointers through
+                                            * retro_get_memory_* as well.
+                                            *
+                                            * Can be called from retro_init and retro_load_game.
+                                            */
+#define RETRO_ENVIRONMENT_SET_GEOMETRY 37
+                                           /* const struct retro_game_geometry * --
+                                            * This environment call is similar to SET_SYSTEM_AV_INFO for changing
+                                            * video parameters, but provides a guarantee that drivers will not be
+                                            * reinitialized.
+                                            * This can only be called from within retro_run().
+                                            *
+                                            * The purpose of this call is to allow a core to alter nominal
+                                            * width/heights as well as aspect ratios on-the-fly, which can be
+                                            * useful for some emulators to change in run-time.
+                                            *
+                                            * max_width/max_height arguments are ignored and cannot be changed
+                                            * with this call as this could potentially require a reinitialization or a
+                                            * non-constant time operation.
+                                            * If max_width/max_height are to be changed, SET_SYSTEM_AV_INFO is required.
+                                            *
+                                            * A frontend must guarantee that this environment call completes in
+                                            * constant time.
+                                            */
+#define RETRO_ENVIRONMENT_GET_USERNAME 38
+                                           /* const char **
+                                            * Returns the specified username of the frontend, if specified by the user.
+                                            * This username can be used as a nickname for a core that has online facilities
+                                            * or any other mode where personalization of the user is desirable.
+                                            * The returned value can be NULL.
+                                            * If this environ callback is used by a core that requires a valid username,
+                                            * a default username should be specified by the core.
+                                            */
+#define RETRO_ENVIRONMENT_GET_LANGUAGE 39
+                                           /* unsigned * --
+                                            * Returns the specified language of the frontend, if specified by the user.
+                                            * It can be used by the core for localization purposes.
+                                            */
+#define RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER (40 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* struct retro_framebuffer * --
+                                            * Returns a preallocated framebuffer which the core can use for rendering
+                                            * the frame into when not using SET_HW_RENDER.
+                                            * The framebuffer returned from this call must not be used
+                                            * after the current call to retro_run() returns.
+                                            *
+                                            * The goal of this call is to allow zero-copy behavior where a core
+                                            * can render directly into video memory, avoiding extra bandwidth cost by copying
+                                            * memory from core to video memory.
+                                            *
+                                            * If this call succeeds and the core renders into it,
+                                            * the framebuffer pointer and pitch can be passed to retro_video_refresh_t.
+                                            * If the buffer from GET_CURRENT_SOFTWARE_FRAMEBUFFER is to be used,
+                                            * the core must pass the exact
+                                            * same pointer as returned by GET_CURRENT_SOFTWARE_FRAMEBUFFER;
+                                            * i.e. passing a pointer which is offset from the
+                                            * buffer is undefined. The width, height and pitch parameters
+                                            * must also match exactly to the values obtained from GET_CURRENT_SOFTWARE_FRAMEBUFFER.
+                                            *
+                                            * It is possible for a frontend to return a different pixel format
+                                            * than the one used in SET_PIXEL_FORMAT. This can happen if the frontend
+                                            * needs to perform conversion.
+                                            *
+                                            * It is still valid for a core to render to a different buffer
+                                            * even if GET_CURRENT_SOFTWARE_FRAMEBUFFER succeeds.
+                                            *
+                                            * A frontend must make sure that the pointer obtained from this function is
+                                            * writeable (and readable).
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_HW_SHARED_CONTEXT (44 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* N/A (null) * --
+                                            * The frontend will try to use a 'shared' hardware context (mostly applicable
+                                            * to OpenGL) when a hardware context is being set up.
+                                            *
+                                            * Returns true if the frontend supports shared hardware contexts and false
+                                            * if the frontend does not support shared hardware contexts.
+                                            *
+                                            * This will do nothing on its own until SET_HW_RENDER env callbacks are
+                                            * being used.
+                                            */
+
+#define RETRO_ENVIRONMENT_GET_VFS_INTERFACE (45 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* struct retro_vfs_interface_info * --
+                                            * Gets access to the VFS interface.
+                                            * VFS presence needs to be queried prior to load_game or any
+                                            * get_system/save/other_directory being called to let front end know
+                                            * core supports VFS before it starts handing out paths.
+                                            * It is recomended to do so in retro_set_environment */
+
+/* VFS functionality */
+
+/* File paths:
+ * File paths passed as parameters when using this api shall be well formed unix-style,
+ * using "/" (unquoted forward slash) as directory separator regardless of the platform's native separator.
+ * Paths shall also include at least one forward slash ("game.bin" is an invalid path, use "./game.bin" instead).
+ * Other than the directory separator, cores shall not make assumptions about path format:
+ * "C:/path/game.bin", "http://example.com/game.bin", "#game/game.bin", "./game.bin" (without quotes) are all valid paths.
+ * Cores may replace the basename or remove path components from the end, and/or add new components;
+ * however, cores shall not append "./", "../" or multiple consecutive forward slashes ("//") to paths they request to front end.
+ * The frontend is encouraged to make such paths work as well as it can, but is allowed to give up if the core alters paths too much.
+ * Frontends are encouraged, but not required, to support native file system paths (modulo replacing the directory separator, if applicable).
+ * Cores are allowed to try using them, but must remain functional if the front rejects such requests.
+ * Cores are encouraged to use the libretro-common filestream functions for file I/O,
+ * as they seamlessly integrate with VFS, deal with directory separator replacement as appropriate
+ * and provide platform-specific fallbacks in cases where front ends do not support VFS. */
+
+/* Opaque file handle
+ * Introduced in VFS API v1 */
+struct retro_vfs_file_handle;
+
+/* File open flags
+ * Introduced in VFS API v1 */
+#define RETRO_VFS_FILE_ACCESS_READ            (1 << 0) /* Read only mode */
+#define RETRO_VFS_FILE_ACCESS_WRITE           (1 << 1) /* Write only mode, discard contents and overwrites existing file unless RETRO_VFS_FILE_ACCESS_UPDATE is also specified */
+#define RETRO_VFS_FILE_ACCESS_READ_WRITE      (RETRO_VFS_FILE_ACCESS_READ | RETRO_VFS_FILE_ACCESS_WRITE) /* Read-write mode, discard contents and overwrites existing file unless RETRO_VFS_FILE_ACCESS_UPDATE is also specified*/
+#define RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING (1 << 2) /* Prevents discarding content of existing files opened for writing */
+
+/* These are only hints. The frontend may choose to ignore them. Other than RAM/CPU/etc use,
+   and how they react to unlikely external interference (for example someone else writing to that file,
+   or the file's server going down), behavior will not change. */
+#define RETRO_VFS_FILE_ACCESS_HINT_NONE              (0)
+/* Indicate that the file will be accessed many times. The frontend should aggressively cache everything. */
+#define RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS   (1 << 0)
+
+/* Seek positions */
+#define RETRO_VFS_SEEK_POSITION_START    0
+#define RETRO_VFS_SEEK_POSITION_CURRENT  1
+#define RETRO_VFS_SEEK_POSITION_END      2
+
+/* Get path from opaque handle. Returns the exact same path passed to file_open when getting the handle
+ * Introduced in VFS API v1 */
+typedef const char *(RETRO_CALLCONV *retro_vfs_get_path_t)(struct retro_vfs_file_handle *stream);
+
+/* Open a file for reading or writing. If path points to a directory, this will
+ * fail. Returns the opaque file handle, or NULL for error.
+ * Introduced in VFS API v1 */
+typedef struct retro_vfs_file_handle *(RETRO_CALLCONV *retro_vfs_open_t)(const char *path, unsigned mode, unsigned hints);
+
+/* Close the file and release its resources. Must be called if open_file returns non-NULL. Returns 0 on succes, -1 on failure.
+ * Whether the call succeeds ot not, the handle passed as parameter becomes invalid and should no longer be used.
+ * Introduced in VFS API v1 */
+typedef int (RETRO_CALLCONV *retro_vfs_close_t)(struct retro_vfs_file_handle *stream);
+
+/* Return the size of the file in bytes, or -1 for error.
+ * Introduced in VFS API v1 */
+typedef int64_t (RETRO_CALLCONV *retro_vfs_size_t)(struct retro_vfs_file_handle *stream);
+
+/* Get the current read / write position for the file. Returns - 1 for error.
+ * Introduced in VFS API v1 */
+typedef int64_t (RETRO_CALLCONV *retro_vfs_tell_t)(struct retro_vfs_file_handle *stream);
+
+/* Set the current read/write position for the file. Returns the new position, -1 for error.
+ * Introduced in VFS API v1 */
+typedef int64_t (RETRO_CALLCONV *retro_vfs_seek_t)(struct retro_vfs_file_handle *stream, int64_t offset, int seek_position);
+
+/* Read data from a file. Returns the number of bytes read, or -1 for error.
+ * Introduced in VFS API v1 */
+typedef int64_t (RETRO_CALLCONV *retro_vfs_read_t)(struct retro_vfs_file_handle *stream, void *s, uint64_t len);
+
+/* Write data to a file. Returns the number of bytes written, or -1 for error.
+ * Introduced in VFS API v1 */
+typedef int64_t (RETRO_CALLCONV *retro_vfs_write_t)(struct retro_vfs_file_handle *stream, const void *s, uint64_t len);
+
+/* Flush pending writes to file, if using buffered IO. Returns 0 on sucess, or -1 on failure.
+ * Introduced in VFS API v1 */
+typedef int (RETRO_CALLCONV *retro_vfs_flush_t)(struct retro_vfs_file_handle *stream);
+
+/* Delete the specified file. Returns 0 on success, -1 on failure
+ * Introduced in VFS API v1 */
+typedef int (RETRO_CALLCONV *retro_vfs_remove_t)(const char *path);
+
+/* Rename the specified file. Returns 0 on success, -1 on failure
+ * Introduced in VFS API v1 */
+typedef int (RETRO_CALLCONV *retro_vfs_rename_t)(const char *old_path, const char *new_path);
+
+struct retro_vfs_interface
+{
+	retro_vfs_get_path_t get_path;
+	retro_vfs_open_t open;
+	retro_vfs_close_t close;
+	retro_vfs_size_t size;
+	retro_vfs_tell_t tell;
+	retro_vfs_seek_t seek;
+	retro_vfs_read_t read;
+	retro_vfs_write_t write;
+	retro_vfs_flush_t flush;
+	retro_vfs_remove_t remove;
+	retro_vfs_rename_t rename;
+};
+
+struct retro_vfs_interface_info
+{
+   /* Set by core: should this be higher than the version the front end supports,
+    * front end will return false in the RETRO_ENVIRONMENT_GET_VFS_INTERFACE call
+    * Introduced in VFS API v1 */
+   uint32_t required_interface_version;
+
+   /* Frontend writes interface pointer here. The frontend also sets the actual
+    * version, must be at least required_interface_version.
+    * Introduced in VFS API v1 */
+   struct retro_vfs_interface *iface;
+};
+
+enum retro_hw_render_interface_type
+{
+	RETRO_HW_RENDER_INTERFACE_VULKAN = 0,
+	RETRO_HW_RENDER_INTERFACE_D3D9   = 1,
+	RETRO_HW_RENDER_INTERFACE_D3D10  = 2,
+	RETRO_HW_RENDER_INTERFACE_D3D11  = 3,
+	RETRO_HW_RENDER_INTERFACE_D3D12  = 4,
+   RETRO_HW_RENDER_INTERFACE_DUMMY  = INT_MAX
+};
+
+/* Base struct. All retro_hw_render_interface_* types
+ * contain at least these fields. */
+struct retro_hw_render_interface
+{
+   enum retro_hw_render_interface_type interface_type;
+   unsigned interface_version;
+};
+
+
+#define RETRO_ENVIRONMENT_GET_LED_INTERFACE (46 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* struct retro_led_interface * --
+                                            * Gets an interface which is used by a libretro core to set
+                                            * state of LEDs.
+                                            */
+
+typedef void (RETRO_CALLCONV *retro_set_led_state_t)(int led, int state);
+struct retro_led_interface
+{
+    retro_set_led_state_t set_led_state;
+};
+
+#define RETRO_ENVIRONMENT_GET_AUDIO_VIDEO_ENABLE (47 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* int * --
+                                            * Queries the frontend if audio and video are enabled or not.
+                                            * If not enabled, the frontend will discard the audio or video,
+                                            * so the core may decide to skip producing audio or video.
+                                            * Bit 0 (value 1) is set if Video is enabled,
+                                            * Bit 1 (value 2) is set if Audio is enabled.
+                                            * Other bits are reserved for future use.
+                                            */
+
+#define RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE (41 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* const struct retro_hw_render_interface ** --
+                                            * Returns an API specific rendering interface for accessing API specific data.
+                                            * Not all HW rendering APIs support or need this.
+                                            * The contents of the returned pointer is specific to the rendering API
+                                            * being used. See the various headers like libretro_vulkan.h, etc.
+                                            *
+                                            * GET_HW_RENDER_INTERFACE cannot be called before context_reset has been called.
+                                            * Similarly, after context_destroyed callback returns,
+                                            * the contents of the HW_RENDER_INTERFACE are invalidated.
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS (42 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* const bool * --
+                                            * If true, the libretro implementation supports achievements
+                                            * either via memory descriptors set with RETRO_ENVIRONMENT_SET_MEMORY_MAPS
+                                            * or via retro_get_memory_data/retro_get_memory_size.
+                                            *
+                                            * This must be called before the first call to retro_run.
+                                            */
+
+enum retro_hw_render_context_negotiation_interface_type
+{
+   RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN = 0,
+   RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_DUMMY = INT_MAX
+};
+
+/* Base struct. All retro_hw_render_context_negotiation_interface_* types
+ * contain at least these fields. */
+struct retro_hw_render_context_negotiation_interface
+{
+   enum retro_hw_render_context_negotiation_interface_type interface_type;
+   unsigned interface_version;
+};
+#define RETRO_ENVIRONMENT_SET_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE (43 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* const struct retro_hw_render_context_negotiation_interface * --
+                                            * Sets an interface which lets the libretro core negotiate with frontend how a context is created.
+                                            * The semantics of this interface depends on which API is used in SET_HW_RENDER earlier.
+                                            * This interface will be used when the frontend is trying to create a HW rendering context,
+                                            * so it will be used after SET_HW_RENDER, but before the context_reset callback.
+                                            */
+
+/* Serialized state is incomplete in some way. Set if serialization is
+ * usable in typical end-user cases but should not be relied upon to
+ * implement frame-sensitive frontend features such as netplay or
+ * rerecording. */
+#define RETRO_SERIALIZATION_QUIRK_INCOMPLETE (1 << 0)
+/* The core must spend some time initializing before serialization is
+ * supported. retro_serialize() will initially fail; retro_unserialize()
+ * and retro_serialize_size() may or may not work correctly either. */
+#define RETRO_SERIALIZATION_QUIRK_MUST_INITIALIZE (1 << 1)
+/* Serialization size may change within a session. */
+#define RETRO_SERIALIZATION_QUIRK_CORE_VARIABLE_SIZE (1 << 2)
+/* Set by the frontend to acknowledge that it supports variable-sized
+ * states. */
+#define RETRO_SERIALIZATION_QUIRK_FRONT_VARIABLE_SIZE (1 << 3)
+/* Serialized state can only be loaded during the same session. */
+#define RETRO_SERIALIZATION_QUIRK_SINGLE_SESSION (1 << 4)
+/* Serialized state cannot be loaded on an architecture with a different
+ * endianness from the one it was saved on. */
+#define RETRO_SERIALIZATION_QUIRK_ENDIAN_DEPENDENT (1 << 5)
+/* Serialized state cannot be loaded on a different platform from the one it
+ * was saved on for reasons other than endianness, such as word size
+ * dependence */
+#define RETRO_SERIALIZATION_QUIRK_PLATFORM_DEPENDENT (1 << 6)
+
+#define RETRO_ENVIRONMENT_SET_SERIALIZATION_QUIRKS 44
+                                           /* uint64_t * --
+                                            * Sets quirk flags associated with serialization. The frontend will zero any flags it doesn't
+                                            * recognize or support. Should be set in either retro_init or retro_load_game, but not both.
+                                            */
+
+#define RETRO_MEMDESC_CONST     (1 << 0)   /* The frontend will never change this memory area once retro_load_game has returned. */
+#define RETRO_MEMDESC_BIGENDIAN (1 << 1)   /* The memory area contains big endian data. Default is little endian. */
+#define RETRO_MEMDESC_ALIGN_2   (1 << 16)  /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */
+#define RETRO_MEMDESC_ALIGN_4   (2 << 16)
+#define RETRO_MEMDESC_ALIGN_8   (3 << 16)
+#define RETRO_MEMDESC_MINSIZE_2 (1 << 24)  /* All memory in this region is accessed at least 2 bytes at the time. */
+#define RETRO_MEMDESC_MINSIZE_4 (2 << 24)
+#define RETRO_MEMDESC_MINSIZE_8 (3 << 24)
+struct retro_memory_descriptor
+{
+   uint64_t flags;
+
+   /* Pointer to the start of the relevant ROM or RAM chip.
+    * It's strongly recommended to use 'offset' if possible, rather than
+    * doing math on the pointer.
+    *
+    * If the same byte is mapped my multiple descriptors, their descriptors
+    * must have the same pointer.
+    * If 'start' does not point to the first byte in the pointer, put the
+    * difference in 'offset' instead.
+    *
+    * May be NULL if there's nothing usable here (e.g. hardware registers and
+    * open bus). No flags should be set if the pointer is NULL.
+    * It's recommended to minimize the number of descriptors if possible,
+    * but not mandatory. */
+   void *ptr;
+   size_t offset;
+
+   /* This is the location in the emulated address space
+    * where the mapping starts. */
+   size_t start;
+
+   /* Which bits must be same as in 'start' for this mapping to apply.
+    * The first memory descriptor to claim a certain byte is the one
+    * that applies.
+    * A bit which is set in 'start' must also be set in this.
+    * Can be zero, in which case each byte is assumed mapped exactly once.
+    * In this case, 'len' must be a power of two. */
+   size_t select;
+
+   /* If this is nonzero, the set bits are assumed not connected to the
+    * memory chip's address pins. */
+   size_t disconnect;
+
+   /* This one tells the size of the current memory area.
+    * If, after start+disconnect are applied, the address is higher than
+    * this, the highest bit of the address is cleared.
+    *
+    * If the address is still too high, the next highest bit is cleared.
+    * Can be zero, in which case it's assumed to be infinite (as limited
+    * by 'select' and 'disconnect'). */
+   size_t len;
+
+   /* To go from emulated address to physical address, the following
+    * order applies:
+    * Subtract 'start', pick off 'disconnect', apply 'len', add 'offset'. */
+
+   /* The address space name must consist of only a-zA-Z0-9_-,
+    * should be as short as feasible (maximum length is 8 plus the NUL),
+    * and may not be any other address space plus one or more 0-9A-F
+    * at the end.
+    * However, multiple memory descriptors for the same address space is
+    * allowed, and the address space name can be empty. NULL is treated
+    * as empty.
+    *
+    * Address space names are case sensitive, but avoid lowercase if possible.
+    * The same pointer may exist in multiple address spaces.
+    *
+    * Examples:
+    * blank+blank - valid (multiple things may be mapped in the same namespace)
+    * 'Sp'+'Sp' - valid (multiple things may be mapped in the same namespace)
+    * 'A'+'B' - valid (neither is a prefix of each other)
+    * 'S'+blank - valid ('S' is not in 0-9A-F)
+    * 'a'+blank - valid ('a' is not in 0-9A-F)
+    * 'a'+'A' - valid (neither is a prefix of each other)
+    * 'AR'+blank - valid ('R' is not in 0-9A-F)
+    * 'ARB'+blank - valid (the B can't be part of the address either, because
+    *                      there is no namespace 'AR')
+    * blank+'B' - not valid, because it's ambigous which address space B1234
+    *             would refer to.
+    * The length can't be used for that purpose; the frontend may want
+    * to append arbitrary data to an address, without a separator. */
+   const char *addrspace;
+
+   /* TODO: When finalizing this one, add a description field, which should be
+    * "WRAM" or something roughly equally long. */
+
+   /* TODO: When finalizing this one, replace 'select' with 'limit', which tells
+    * which bits can vary and still refer to the same address (limit = ~select).
+    * TODO: limit? range? vary? something else? */
+
+   /* TODO: When finalizing this one, if 'len' is above what 'select' (or
+    * 'limit') allows, it's bankswitched. Bankswitched data must have both 'len'
+    * and 'select' != 0, and the mappings don't tell how the system switches the
+    * banks. */
+
+   /* TODO: When finalizing this one, fix the 'len' bit removal order.
+    * For len=0x1800, pointer 0x1C00 should go to 0x1400, not 0x0C00.
+    * Algorithm: Take bits highest to lowest, but if it goes above len, clear
+    * the most recent addition and continue on the next bit.
+    * TODO: Can the above be optimized? Is "remove the lowest bit set in both
+    * pointer and 'len'" equivalent? */
+
+   /* TODO: Some emulators (MAME?) emulate big endian systems by only accessing
+    * the emulated memory in 32-bit chunks, native endian. But that's nothing
+    * compared to Darek Mihocka <http://www.emulators.com/docs/nx07_vm101.htm>
+    * (section Emulation 103 - Nearly Free Byte Reversal) - he flips the ENTIRE
+    * RAM backwards! I'll want to represent both of those, via some flags.
+    *
+    * I suspect MAME either didn't think of that idea, or don't want the #ifdef.
+    * Not sure which, nor do I really care. */
+
+   /* TODO: Some of those flags are unused and/or don't really make sense. Clean
+    * them up. */
+};
+
+/* The frontend may use the largest value of 'start'+'select' in a
+ * certain namespace to infer the size of the address space.
+ *
+ * If the address space is larger than that, a mapping with .ptr=NULL
+ * should be at the end of the array, with .select set to all ones for
+ * as long as the address space is big.
+ *
+ * Sample descriptors (minus .ptr, and RETRO_MEMFLAG_ on the flags):
+ * SNES WRAM:
+ * .start=0x7E0000, .len=0x20000
+ * (Note that this must be mapped before the ROM in most cases; some of the
+ * ROM mappers
+ * try to claim $7E0000, or at least $7E8000.)
+ * SNES SPC700 RAM:
+ * .addrspace="S", .len=0x10000
+ * SNES WRAM mirrors:
+ * .flags=MIRROR, .start=0x000000, .select=0xC0E000, .len=0x2000
+ * .flags=MIRROR, .start=0x800000, .select=0xC0E000, .len=0x2000
+ * SNES WRAM mirrors, alternate equivalent descriptor:
+ * .flags=MIRROR, .select=0x40E000, .disconnect=~0x1FFF
+ * (Various similar constructions can be created by combining parts of
+ * the above two.)
+ * SNES LoROM (512KB, mirrored a couple of times):
+ * .flags=CONST, .start=0x008000, .select=0x408000, .disconnect=0x8000, .len=512*1024
+ * .flags=CONST, .start=0x400000, .select=0x400000, .disconnect=0x8000, .len=512*1024
+ * SNES HiROM (4MB):
+ * .flags=CONST,                 .start=0x400000, .select=0x400000, .len=4*1024*1024
+ * .flags=CONST, .offset=0x8000, .start=0x008000, .select=0x408000, .len=4*1024*1024
+ * SNES ExHiROM (8MB):
+ * .flags=CONST, .offset=0,                  .start=0xC00000, .select=0xC00000, .len=4*1024*1024
+ * .flags=CONST, .offset=4*1024*1024,        .start=0x400000, .select=0xC00000, .len=4*1024*1024
+ * .flags=CONST, .offset=0x8000,             .start=0x808000, .select=0xC08000, .len=4*1024*1024
+ * .flags=CONST, .offset=4*1024*1024+0x8000, .start=0x008000, .select=0xC08000, .len=4*1024*1024
+ * Clarify the size of the address space:
+ * .ptr=NULL, .select=0xFFFFFF
+ * .len can be implied by .select in many of them, but was included for clarity.
+ */
+
+struct retro_memory_map
+{
+   const struct retro_memory_descriptor *descriptors;
+   unsigned num_descriptors;
+};
+
+struct retro_controller_description
+{
+   /* Human-readable description of the controller. Even if using a generic
+    * input device type, this can be set to the particular device type the
+    * core uses. */
+   const char *desc;
+
+   /* Device type passed to retro_set_controller_port_device(). If the device
+    * type is a sub-class of a generic input device type, use the
+    * RETRO_DEVICE_SUBCLASS macro to create an ID.
+    *
+    * E.g. RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 1). */
+   unsigned id;
+};
+
+struct retro_controller_info
+{
+   const struct retro_controller_description *types;
+   unsigned num_types;
+};
+
+struct retro_subsystem_memory_info
+{
+   /* The extension associated with a memory type, e.g. "psram". */
+   const char *extension;
+
+   /* The memory type for retro_get_memory(). This should be at
+    * least 0x100 to avoid conflict with standardized
+    * libretro memory types. */
+   unsigned type;
+};
+
+struct retro_subsystem_rom_info
+{
+   /* Describes what the content is (SGB BIOS, GB ROM, etc). */
+   const char *desc;
+
+   /* Same definition as retro_get_system_info(). */
+   const char *valid_extensions;
+
+   /* Same definition as retro_get_system_info(). */
+   bool need_fullpath;
+
+   /* Same definition as retro_get_system_info(). */
+   bool block_extract;
+
+   /* This is set if the content is required to load a game.
+    * If this is set to false, a zeroed-out retro_game_info can be passed. */
+   bool required;
+
+   /* Content can have multiple associated persistent
+    * memory types (retro_get_memory()). */
+   const struct retro_subsystem_memory_info *memory;
+   unsigned num_memory;
+};
+
+struct retro_subsystem_info
+{
+   /* Human-readable string of the subsystem type, e.g. "Super GameBoy" */
+   const char *desc;
+
+   /* A computer friendly short string identifier for the subsystem type.
+    * This name must be [a-z].
+    * E.g. if desc is "Super GameBoy", this can be "sgb".
+    * This identifier can be used for command-line interfaces, etc.
+    */
+   const char *ident;
+
+   /* Infos for each content file. The first entry is assumed to be the
+    * "most significant" content for frontend purposes.
+    * E.g. with Super GameBoy, the first content should be the GameBoy ROM,
+    * as it is the most "significant" content to a user.
+    * If a frontend creates new file paths based on the content used
+    * (e.g. savestates), it should use the path for the first ROM to do so. */
+   const struct retro_subsystem_rom_info *roms;
+
+   /* Number of content files associated with a subsystem. */
+   unsigned num_roms;
+
+   /* The type passed to retro_load_game_special(). */
+   unsigned id;
+};
+
+typedef void (RETRO_CALLCONV *retro_proc_address_t)(void);
+
+/* libretro API extension functions:
+ * (None here so far).
+ *
+ * Get a symbol from a libretro core.
+ * Cores should only return symbols which are actual
+ * extensions to the libretro API.
+ *
+ * Frontends should not use this to obtain symbols to standard
+ * libretro entry points (static linking or dlsym).
+ *
+ * The symbol name must be equal to the function name,
+ * e.g. if void retro_foo(void); exists, the symbol must be called "retro_foo".
+ * The returned function pointer must be cast to the corresponding type.
+ */
+typedef retro_proc_address_t (RETRO_CALLCONV *retro_get_proc_address_t)(const char *sym);
+
+struct retro_get_proc_address_interface
+{
+   retro_get_proc_address_t get_proc_address;
+};
+
+enum retro_log_level
+{
+   RETRO_LOG_DEBUG = 0,
+   RETRO_LOG_INFO,
+   RETRO_LOG_WARN,
+   RETRO_LOG_ERROR,
+
+   RETRO_LOG_DUMMY = INT_MAX
+};
+
+/* Logging function. Takes log level argument as well. */
+typedef void (RETRO_CALLCONV *retro_log_printf_t)(enum retro_log_level level,
+      const char *fmt, ...);
+
+struct retro_log_callback
+{
+   retro_log_printf_t log;
+};
+
+/* Performance related functions */
+
+/* ID values for SIMD CPU features */
+#define RETRO_SIMD_SSE      (1 << 0)
+#define RETRO_SIMD_SSE2     (1 << 1)
+#define RETRO_SIMD_VMX      (1 << 2)
+#define RETRO_SIMD_VMX128   (1 << 3)
+#define RETRO_SIMD_AVX      (1 << 4)
+#define RETRO_SIMD_NEON     (1 << 5)
+#define RETRO_SIMD_SSE3     (1 << 6)
+#define RETRO_SIMD_SSSE3    (1 << 7)
+#define RETRO_SIMD_MMX      (1 << 8)
+#define RETRO_SIMD_MMXEXT   (1 << 9)
+#define RETRO_SIMD_SSE4     (1 << 10)
+#define RETRO_SIMD_SSE42    (1 << 11)
+#define RETRO_SIMD_AVX2     (1 << 12)
+#define RETRO_SIMD_VFPU     (1 << 13)
+#define RETRO_SIMD_PS       (1 << 14)
+#define RETRO_SIMD_AES      (1 << 15)
+#define RETRO_SIMD_VFPV3    (1 << 16)
+#define RETRO_SIMD_VFPV4    (1 << 17)
+#define RETRO_SIMD_POPCNT   (1 << 18)
+#define RETRO_SIMD_MOVBE    (1 << 19)
+#define RETRO_SIMD_CMOV     (1 << 20)
+#define RETRO_SIMD_ASIMD    (1 << 21)
+
+typedef uint64_t retro_perf_tick_t;
+typedef int64_t retro_time_t;
+
+struct retro_perf_counter
+{
+   const char *ident;
+   retro_perf_tick_t start;
+   retro_perf_tick_t total;
+   retro_perf_tick_t call_cnt;
+
+   bool registered;
+};
+
+/* Returns current time in microseconds.
+ * Tries to use the most accurate timer available.
+ */
+typedef retro_time_t (RETRO_CALLCONV *retro_perf_get_time_usec_t)(void);
+
+/* A simple counter. Usually nanoseconds, but can also be CPU cycles.
+ * Can be used directly if desired (when creating a more sophisticated
+ * performance counter system).
+ * */
+typedef retro_perf_tick_t (RETRO_CALLCONV *retro_perf_get_counter_t)(void);
+
+/* Returns a bit-mask of detected CPU features (RETRO_SIMD_*). */
+typedef uint64_t (RETRO_CALLCONV *retro_get_cpu_features_t)(void);
+
+/* Asks frontend to log and/or display the state of performance counters.
+ * Performance counters can always be poked into manually as well.
+ */
+typedef void (RETRO_CALLCONV *retro_perf_log_t)(void);
+
+/* Register a performance counter.
+ * ident field must be set with a discrete value and other values in
+ * retro_perf_counter must be 0.
+ * Registering can be called multiple times. To avoid calling to
+ * frontend redundantly, you can check registered field first. */
+typedef void (RETRO_CALLCONV *retro_perf_register_t)(struct retro_perf_counter *counter);
+
+/* Starts a registered counter. */
+typedef void (RETRO_CALLCONV *retro_perf_start_t)(struct retro_perf_counter *counter);
+
+/* Stops a registered counter. */
+typedef void (RETRO_CALLCONV *retro_perf_stop_t)(struct retro_perf_counter *counter);
+
+/* For convenience it can be useful to wrap register, start and stop in macros.
+ * E.g.:
+ * #ifdef LOG_PERFORMANCE
+ * #define RETRO_PERFORMANCE_INIT(perf_cb, name) static struct retro_perf_counter name = {#name}; if (!name.registered) perf_cb.perf_register(&(name))
+ * #define RETRO_PERFORMANCE_START(perf_cb, name) perf_cb.perf_start(&(name))
+ * #define RETRO_PERFORMANCE_STOP(perf_cb, name) perf_cb.perf_stop(&(name))
+ * #else
+ * ... Blank macros ...
+ * #endif
+ *
+ * These can then be used mid-functions around code snippets.
+ *
+ * extern struct retro_perf_callback perf_cb;  * Somewhere in the core.
+ *
+ * void do_some_heavy_work(void)
+ * {
+ *    RETRO_PERFORMANCE_INIT(cb, work_1;
+ *    RETRO_PERFORMANCE_START(cb, work_1);
+ *    heavy_work_1();
+ *    RETRO_PERFORMANCE_STOP(cb, work_1);
+ *
+ *    RETRO_PERFORMANCE_INIT(cb, work_2);
+ *    RETRO_PERFORMANCE_START(cb, work_2);
+ *    heavy_work_2();
+ *    RETRO_PERFORMANCE_STOP(cb, work_2);
+ * }
+ *
+ * void retro_deinit(void)
+ * {
+ *    perf_cb.perf_log();  * Log all perf counters here for example.
+ * }
+ */
+
+struct retro_perf_callback
+{
+   retro_perf_get_time_usec_t    get_time_usec;
+   retro_get_cpu_features_t      get_cpu_features;
+
+   retro_perf_get_counter_t      get_perf_counter;
+   retro_perf_register_t         perf_register;
+   retro_perf_start_t            perf_start;
+   retro_perf_stop_t             perf_stop;
+   retro_perf_log_t              perf_log;
+};
+
+/* FIXME: Document the sensor API and work out behavior.
+ * It will be marked as experimental until then.
+ */
+enum retro_sensor_action
+{
+   RETRO_SENSOR_ACCELEROMETER_ENABLE = 0,
+   RETRO_SENSOR_ACCELEROMETER_DISABLE,
+
+   RETRO_SENSOR_DUMMY = INT_MAX
+};
+
+/* Id values for SENSOR types. */
+#define RETRO_SENSOR_ACCELEROMETER_X 0
+#define RETRO_SENSOR_ACCELEROMETER_Y 1
+#define RETRO_SENSOR_ACCELEROMETER_Z 2
+
+typedef bool (RETRO_CALLCONV *retro_set_sensor_state_t)(unsigned port,
+      enum retro_sensor_action action, unsigned rate);
+
+typedef float (RETRO_CALLCONV *retro_sensor_get_input_t)(unsigned port, unsigned id);
+
+struct retro_sensor_interface
+{
+   retro_set_sensor_state_t set_sensor_state;
+   retro_sensor_get_input_t get_sensor_input;
+};
+
+enum retro_camera_buffer
+{
+   RETRO_CAMERA_BUFFER_OPENGL_TEXTURE = 0,
+   RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER,
+
+   RETRO_CAMERA_BUFFER_DUMMY = INT_MAX
+};
+
+/* Starts the camera driver. Can only be called in retro_run(). */
+typedef bool (RETRO_CALLCONV *retro_camera_start_t)(void);
+
+/* Stops the camera driver. Can only be called in retro_run(). */
+typedef void (RETRO_CALLCONV *retro_camera_stop_t)(void);
+
+/* Callback which signals when the camera driver is initialized
+ * and/or deinitialized.
+ * retro_camera_start_t can be called in initialized callback.
+ */
+typedef void (RETRO_CALLCONV *retro_camera_lifetime_status_t)(void);
+
+/* A callback for raw framebuffer data. buffer points to an XRGB8888 buffer.
+ * Width, height and pitch are similar to retro_video_refresh_t.
+ * First pixel is top-left origin.
+ */
+typedef void (RETRO_CALLCONV *retro_camera_frame_raw_framebuffer_t)(const uint32_t *buffer,
+      unsigned width, unsigned height, size_t pitch);
+
+/* A callback for when OpenGL textures are used.
+ *
+ * texture_id is a texture owned by camera driver.
+ * Its state or content should be considered immutable, except for things like
+ * texture filtering and clamping.
+ *
+ * texture_target is the texture target for the GL texture.
+ * These can include e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE, and possibly
+ * more depending on extensions.
+ *
+ * affine points to a packed 3x3 column-major matrix used to apply an affine
+ * transform to texture coordinates. (affine_matrix * vec3(coord_x, coord_y, 1.0))
+ * After transform, normalized texture coord (0, 0) should be bottom-left
+ * and (1, 1) should be top-right (or (width, height) for RECTANGLE).
+ *
+ * GL-specific typedefs are avoided here to avoid relying on gl.h in
+ * the API definition.
+ */
+typedef void (RETRO_CALLCONV *retro_camera_frame_opengl_texture_t)(unsigned texture_id,
+      unsigned texture_target, const float *affine);
+
+struct retro_camera_callback
+{
+   /* Set by libretro core.
+    * Example bitmask: caps = (1 << RETRO_CAMERA_BUFFER_OPENGL_TEXTURE) | (1 << RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER).
+    */
+   uint64_t caps;
+
+   /* Desired resolution for camera. Is only used as a hint. */
+   unsigned width;
+   unsigned height;
+
+   /* Set by frontend. */
+   retro_camera_start_t start;
+   retro_camera_stop_t stop;
+
+   /* Set by libretro core if raw framebuffer callbacks will be used. */
+   retro_camera_frame_raw_framebuffer_t frame_raw_framebuffer;
+
+   /* Set by libretro core if OpenGL texture callbacks will be used. */
+   retro_camera_frame_opengl_texture_t frame_opengl_texture;
+
+   /* Set by libretro core. Called after camera driver is initialized and
+    * ready to be started.
+    * Can be NULL, in which this callback is not called.
+    */
+   retro_camera_lifetime_status_t initialized;
+
+   /* Set by libretro core. Called right before camera driver is
+    * deinitialized.
+    * Can be NULL, in which this callback is not called.
+    */
+   retro_camera_lifetime_status_t deinitialized;
+};
+
+/* Sets the interval of time and/or distance at which to update/poll
+ * location-based data.
+ *
+ * To ensure compatibility with all location-based implementations,
+ * values for both interval_ms and interval_distance should be provided.
+ *
+ * interval_ms is the interval expressed in milliseconds.
+ * interval_distance is the distance interval expressed in meters.
+ */
+typedef void (RETRO_CALLCONV *retro_location_set_interval_t)(unsigned interval_ms,
+      unsigned interval_distance);
+
+/* Start location services. The device will start listening for changes to the
+ * current location at regular intervals (which are defined with
+ * retro_location_set_interval_t). */
+typedef bool (RETRO_CALLCONV *retro_location_start_t)(void);
+
+/* Stop location services. The device will stop listening for changes
+ * to the current location. */
+typedef void (RETRO_CALLCONV *retro_location_stop_t)(void);
+
+/* Get the position of the current location. Will set parameters to
+ * 0 if no new  location update has happened since the last time. */
+typedef bool (RETRO_CALLCONV *retro_location_get_position_t)(double *lat, double *lon,
+      double *horiz_accuracy, double *vert_accuracy);
+
+/* Callback which signals when the location driver is initialized
+ * and/or deinitialized.
+ * retro_location_start_t can be called in initialized callback.
+ */
+typedef void (RETRO_CALLCONV *retro_location_lifetime_status_t)(void);
+
+struct retro_location_callback
+{
+   retro_location_start_t         start;
+   retro_location_stop_t          stop;
+   retro_location_get_position_t  get_position;
+   retro_location_set_interval_t  set_interval;
+
+   retro_location_lifetime_status_t initialized;
+   retro_location_lifetime_status_t deinitialized;
+};
+
+enum retro_rumble_effect
+{
+   RETRO_RUMBLE_STRONG = 0,
+   RETRO_RUMBLE_WEAK = 1,
+
+   RETRO_RUMBLE_DUMMY = INT_MAX
+};
+
+/* Sets rumble state for joypad plugged in port 'port'.
+ * Rumble effects are controlled independently,
+ * and setting e.g. strong rumble does not override weak rumble.
+ * Strength has a range of [0, 0xffff].
+ *
+ * Returns true if rumble state request was honored.
+ * Calling this before first retro_run() is likely to return false. */
+typedef bool (RETRO_CALLCONV *retro_set_rumble_state_t)(unsigned port,
+      enum retro_rumble_effect effect, uint16_t strength);
+
+struct retro_rumble_interface
+{
+   retro_set_rumble_state_t set_rumble_state;
+};
+
+/* Notifies libretro that audio data should be written. */
+typedef void (RETRO_CALLCONV *retro_audio_callback_t)(void);
+
+/* True: Audio driver in frontend is active, and callback is
+ * expected to be called regularily.
+ * False: Audio driver in frontend is paused or inactive.
+ * Audio callback will not be called until set_state has been
+ * called with true.
+ * Initial state is false (inactive).
+ */
+typedef void (RETRO_CALLCONV *retro_audio_set_state_callback_t)(bool enabled);
+
+struct retro_audio_callback
+{
+   retro_audio_callback_t callback;
+   retro_audio_set_state_callback_t set_state;
+};
+
+/* Notifies a libretro core of time spent since last invocation
+ * of retro_run() in microseconds.
+ *
+ * It will be called right before retro_run() every frame.
+ * The frontend can tamper with timing to support cases like
+ * fast-forward, slow-motion and framestepping.
+ *
+ * In those scenarios the reference frame time value will be used. */
+typedef int64_t retro_usec_t;
+typedef void (RETRO_CALLCONV *retro_frame_time_callback_t)(retro_usec_t usec);
+struct retro_frame_time_callback
+{
+   retro_frame_time_callback_t callback;
+   /* Represents the time of one frame. It is computed as
+    * 1000000 / fps, but the implementation will resolve the
+    * rounding to ensure that framestepping, etc is exact. */
+   retro_usec_t reference;
+};
+
+/* Pass this to retro_video_refresh_t if rendering to hardware.
+ * Passing NULL to retro_video_refresh_t is still a frame dupe as normal.
+ * */
+#define RETRO_HW_FRAME_BUFFER_VALID ((void*)-1)
+
+/* Invalidates the current HW context.
+ * Any GL state is lost, and must not be deinitialized explicitly.
+ * If explicit deinitialization is desired by the libretro core,
+ * it should implement context_destroy callback.
+ * If called, all GPU resources must be reinitialized.
+ * Usually called when frontend reinits video driver.
+ * Also called first time video driver is initialized,
+ * allowing libretro core to initialize resources.
+ */
+typedef void (RETRO_CALLCONV *retro_hw_context_reset_t)(void);
+
+/* Gets current framebuffer which is to be rendered to.
+ * Could change every frame potentially.
+ */
+typedef uintptr_t (RETRO_CALLCONV *retro_hw_get_current_framebuffer_t)(void);
+
+/* Get a symbol from HW context. */
+typedef retro_proc_address_t (RETRO_CALLCONV *retro_hw_get_proc_address_t)(const char *sym);
+
+enum retro_hw_context_type
+{
+   RETRO_HW_CONTEXT_NONE             = 0,
+   /* OpenGL 2.x. Driver can choose to use latest compatibility context. */
+   RETRO_HW_CONTEXT_OPENGL           = 1,
+   /* OpenGL ES 2.0. */
+   RETRO_HW_CONTEXT_OPENGLES2        = 2,
+   /* Modern desktop core GL context. Use version_major/
+    * version_minor fields to set GL version. */
+   RETRO_HW_CONTEXT_OPENGL_CORE      = 3,
+   /* OpenGL ES 3.0 */
+   RETRO_HW_CONTEXT_OPENGLES3        = 4,
+   /* OpenGL ES 3.1+. Set version_major/version_minor. For GLES2 and GLES3,
+    * use the corresponding enums directly. */
+   RETRO_HW_CONTEXT_OPENGLES_VERSION = 5,
+
+   /* Vulkan, see RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE. */
+   RETRO_HW_CONTEXT_VULKAN           = 6,
+
+   /* Direct3D, set version_major to select the type of interface
+    * returned by RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE */
+   RETRO_HW_CONTEXT_DIRECT3D         = 7,
+
+   RETRO_HW_CONTEXT_DUMMY = INT_MAX
+};
+
+struct retro_hw_render_callback
+{
+   /* Which API to use. Set by libretro core. */
+   enum retro_hw_context_type context_type;
+
+   /* Called when a context has been created or when it has been reset.
+    * An OpenGL context is only valid after context_reset() has been called.
+    *
+    * When context_reset is called, OpenGL resources in the libretro
+    * implementation are guaranteed to be invalid.
+    *
+    * It is possible that context_reset is called multiple times during an
+    * application lifecycle.
+    * If context_reset is called without any notification (context_destroy),
+    * the OpenGL context was lost and resources should just be recreated
+    * without any attempt to "free" old resources.
+    */
+   retro_hw_context_reset_t context_reset;
+
+   /* Set by frontend.
+    * TODO: This is rather obsolete. The frontend should not
+    * be providing preallocated framebuffers. */
+   retro_hw_get_current_framebuffer_t get_current_framebuffer;
+
+   /* Set by frontend.
+    * Can return all relevant functions, including glClear on Windows. */
+   retro_hw_get_proc_address_t get_proc_address;
+
+   /* Set if render buffers should have depth component attached.
+    * TODO: Obsolete. */
+   bool depth;
+
+   /* Set if stencil buffers should be attached.
+    * TODO: Obsolete. */
+   bool stencil;
+
+   /* If depth and stencil are true, a packed 24/8 buffer will be added.
+    * Only attaching stencil is invalid and will be ignored. */
+
+   /* Use conventional bottom-left origin convention. If false,
+    * standard libretro top-left origin semantics are used.
+    * TODO: Move to GL specific interface. */
+   bool bottom_left_origin;
+
+   /* Major version number for core GL context or GLES 3.1+. */
+   unsigned version_major;
+
+   /* Minor version number for core GL context or GLES 3.1+. */
+   unsigned version_minor;
+
+   /* If this is true, the frontend will go very far to avoid
+    * resetting context in scenarios like toggling fullscreen, etc.
+    * TODO: Obsolete? Maybe frontend should just always assume this ...
+    */
+   bool cache_context;
+
+   /* The reset callback might still be called in extreme situations
+    * such as if the context is lost beyond recovery.
+    *
+    * For optimal stability, set this to false, and allow context to be
+    * reset at any time.
+    */
+
+   /* A callback to be called before the context is destroyed in a
+    * controlled way by the frontend. */
+   retro_hw_context_reset_t context_destroy;
+
+   /* OpenGL resources can be deinitialized cleanly at this step.
+    * context_destroy can be set to NULL, in which resources will
+    * just be destroyed without any notification.
+    *
+    * Even when context_destroy is non-NULL, it is possible that
+    * context_reset is called without any destroy notification.
+    * This happens if context is lost by external factors (such as
+    * notified by GL_ARB_robustness).
+    *
+    * In this case, the context is assumed to be already dead,
+    * and the libretro implementation must not try to free any OpenGL
+    * resources in the subsequent context_reset.
+    */
+
+   /* Creates a debug context. */
+   bool debug_context;
+};
+
+/* Callback type passed in RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK.
+ * Called by the frontend in response to keyboard events.
+ * down is set if the key is being pressed, or false if it is being released.
+ * keycode is the RETROK value of the char.
+ * character is the text character of the pressed key. (UTF-32).
+ * key_modifiers is a set of RETROKMOD values or'ed together.
+ *
+ * The pressed/keycode state can be indepedent of the character.
+ * It is also possible that multiple characters are generated from a
+ * single keypress.
+ * Keycode events should be treated separately from character events.
+ * However, when possible, the frontend should try to synchronize these.
+ * If only a character is posted, keycode should be RETROK_UNKNOWN.
+ *
+ * Similarily if only a keycode event is generated with no corresponding
+ * character, character should be 0.
+ */
+typedef void (RETRO_CALLCONV *retro_keyboard_event_t)(bool down, unsigned keycode,
+      uint32_t character, uint16_t key_modifiers);
+
+struct retro_keyboard_callback
+{
+   retro_keyboard_event_t callback;
+};
+
+/* Callbacks for RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE.
+ * Should be set for implementations which can swap out multiple disk
+ * images in runtime.
+ *
+ * If the implementation can do this automatically, it should strive to do so.
+ * However, there are cases where the user must manually do so.
+ *
+ * Overview: To swap a disk image, eject the disk image with
+ * set_eject_state(true).
+ * Set the disk index with set_image_index(index). Insert the disk again
+ * with set_eject_state(false).
+ */
+
+/* If ejected is true, "ejects" the virtual disk tray.
+ * When ejected, the disk image index can be set.
+ */
+typedef bool (RETRO_CALLCONV *retro_set_eject_state_t)(bool ejected);
+
+/* Gets current eject state. The initial state is 'not ejected'. */
+typedef bool (RETRO_CALLCONV *retro_get_eject_state_t)(void);
+
+/* Gets current disk index. First disk is index 0.
+ * If return value is >= get_num_images(), no disk is currently inserted.
+ */
+typedef unsigned (RETRO_CALLCONV *retro_get_image_index_t)(void);
+
+/* Sets image index. Can only be called when disk is ejected.
+ * The implementation supports setting "no disk" by using an
+ * index >= get_num_images().
+ */
+typedef bool (RETRO_CALLCONV *retro_set_image_index_t)(unsigned index);
+
+/* Gets total number of images which are available to use. */
+typedef unsigned (RETRO_CALLCONV *retro_get_num_images_t)(void);
+
+struct retro_game_info;
+
+/* Replaces the disk image associated with index.
+ * Arguments to pass in info have same requirements as retro_load_game().
+ * Virtual disk tray must be ejected when calling this.
+ *
+ * Replacing a disk image with info = NULL will remove the disk image
+ * from the internal list.
+ * As a result, calls to get_image_index() can change.
+ *
+ * E.g. replace_image_index(1, NULL), and previous get_image_index()
+ * returned 4 before.
+ * Index 1 will be removed, and the new index is 3.
+ */
+typedef bool (RETRO_CALLCONV *retro_replace_image_index_t)(unsigned index,
+      const struct retro_game_info *info);
+
+/* Adds a new valid index (get_num_images()) to the internal disk list.
+ * This will increment subsequent return values from get_num_images() by 1.
+ * This image index cannot be used until a disk image has been set
+ * with replace_image_index. */
+typedef bool (RETRO_CALLCONV *retro_add_image_index_t)(void);
+
+struct retro_disk_control_callback
+{
+   retro_set_eject_state_t set_eject_state;
+   retro_get_eject_state_t get_eject_state;
+
+   retro_get_image_index_t get_image_index;
+   retro_set_image_index_t set_image_index;
+   retro_get_num_images_t  get_num_images;
+
+   retro_replace_image_index_t replace_image_index;
+   retro_add_image_index_t add_image_index;
+};
+
+enum retro_pixel_format
+{
+   /* 0RGB1555, native endian.
+    * 0 bit must be set to 0.
+    * This pixel format is default for compatibility concerns only.
+    * If a 15/16-bit pixel format is desired, consider using RGB565. */
+   RETRO_PIXEL_FORMAT_0RGB1555 = 0,
+
+   /* XRGB8888, native endian.
+    * X bits are ignored. */
+   RETRO_PIXEL_FORMAT_XRGB8888 = 1,
+
+   /* RGB565, native endian.
+    * This pixel format is the recommended format to use if a 15/16-bit
+    * format is desired as it is the pixel format that is typically
+    * available on a wide range of low-power devices.
+    *
+    * It is also natively supported in APIs like OpenGL ES. */
+   RETRO_PIXEL_FORMAT_RGB565   = 2,
+
+   /* Ensure sizeof() == sizeof(int). */
+   RETRO_PIXEL_FORMAT_UNKNOWN  = INT_MAX
+};
+
+struct retro_message
+{
+   const char *msg;        /* Message to be displayed. */
+   unsigned    frames;     /* Duration in frames of message. */
+};
+
+/* Describes how the libretro implementation maps a libretro input bind
+ * to its internal input system through a human readable string.
+ * This string can be used to better let a user configure input. */
+struct retro_input_descriptor
+{
+   /* Associates given parameters with a description. */
+   unsigned port;
+   unsigned device;
+   unsigned index;
+   unsigned id;
+
+   /* Human readable description for parameters.
+    * The pointer must remain valid until
+    * retro_unload_game() is called. */
+   const char *description;
+};
+
+struct retro_system_info
+{
+   /* All pointers are owned by libretro implementation, and pointers must
+    * remain valid until retro_deinit() is called. */
+
+   const char *library_name;      /* Descriptive name of library. Should not
+                                   * contain any version numbers, etc. */
+   const char *library_version;   /* Descriptive version of core. */
+
+   const char *valid_extensions;  /* A string listing probably content
+                                   * extensions the core will be able to
+                                   * load, separated with pipe.
+                                   * I.e. "bin|rom|iso".
+                                   * Typically used for a GUI to filter
+                                   * out extensions. */
+
+   /* If true, retro_load_game() is guaranteed to provide a valid pathname
+    * in retro_game_info::path.
+    * ::data and ::size are both invalid.
+    *
+    * If false, ::data and ::size are guaranteed to be valid, but ::path
+    * might not be valid.
+    *
+    * This is typically set to true for libretro implementations that must
+    * load from file.
+    * Implementations should strive for setting this to false, as it allows
+    * the frontend to perform patching, etc. */
+   bool        need_fullpath;
+
+   /* If true, the frontend is not allowed to extract any archives before
+    * loading the real content.
+    * Necessary for certain libretro implementations that load games
+    * from zipped archives. */
+   bool        block_extract;
+};
+
+struct retro_game_geometry
+{
+   unsigned base_width;    /* Nominal video width of game. */
+   unsigned base_height;   /* Nominal video height of game. */
+   unsigned max_width;     /* Maximum possible width of game. */
+   unsigned max_height;    /* Maximum possible height of game. */
+
+   float    aspect_ratio;  /* Nominal aspect ratio of game. If
+                            * aspect_ratio is <= 0.0, an aspect ratio
+                            * of base_width / base_height is assumed.
+                            * A frontend could override this setting,
+                            * if desired. */
+};
+
+struct retro_system_timing
+{
+   double fps;             /* FPS of video content. */
+   double sample_rate;     /* Sampling rate of audio. */
+};
+
+struct retro_system_av_info
+{
+   struct retro_game_geometry geometry;
+   struct retro_system_timing timing;
+};
+
+struct retro_variable
+{
+   /* Variable to query in RETRO_ENVIRONMENT_GET_VARIABLE.
+    * If NULL, obtains the complete environment string if more
+    * complex parsing is necessary.
+    * The environment string is formatted as key-value pairs
+    * delimited by semicolons as so:
+    * "key1=value1;key2=value2;..."
+    */
+   const char *key;
+
+   /* Value to be obtained. If key does not exist, it is set to NULL. */
+   const char *value;
+};
+
+struct retro_game_info
+{
+   const char *path;       /* Path to game, UTF-8 encoded.
+                            * Sometimes used as a reference for building other paths.
+                            * May be NULL if game was loaded from stdin or similar,
+                            * but in this case some cores will be unable to load `data`.
+                            * So, it is preferable to fabricate something here instead
+                            * of passing NULL, which will help more cores to succeed.
+                            * retro_system_info::need_fullpath requires
+                            * that this path is valid. */
+   const void *data;       /* Memory buffer of loaded game. Will be NULL
+                            * if need_fullpath was set. */
+   size_t      size;       /* Size of memory buffer. */
+   const char *meta;       /* String of implementation specific meta-data. */
+};
+
+#define RETRO_MEMORY_ACCESS_WRITE (1 << 0)
+   /* The core will write to the buffer provided by retro_framebuffer::data. */
+#define RETRO_MEMORY_ACCESS_READ (1 << 1)
+   /* The core will read from retro_framebuffer::data. */
+#define RETRO_MEMORY_TYPE_CACHED (1 << 0)
+   /* The memory in data is cached.
+    * If not cached, random writes and/or reading from the buffer is expected to be very slow. */
+struct retro_framebuffer
+{
+   void *data;                      /* The framebuffer which the core can render into.
+                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER.
+                                       The initial contents of data are unspecified. */
+   unsigned width;                  /* The framebuffer width used by the core. Set by core. */
+   unsigned height;                 /* The framebuffer height used by the core. Set by core. */
+   size_t pitch;                    /* The number of bytes between the beginning of a scanline,
+                                       and beginning of the next scanline.
+                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */
+   enum retro_pixel_format format;  /* The pixel format the core must use to render into data.
+                                       This format could differ from the format used in
+                                       SET_PIXEL_FORMAT.
+                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */
+
+   unsigned access_flags;           /* How the core will access the memory in the framebuffer.
+                                       RETRO_MEMORY_ACCESS_* flags.
+                                       Set by core. */
+   unsigned memory_flags;           /* Flags telling core how the memory has been mapped.
+                                       RETRO_MEMORY_TYPE_* flags.
+                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */
+};
+
+/* Callbacks */
+
+/* Environment callback. Gives implementations a way of performing
+ * uncommon tasks. Extensible. */
+typedef bool (RETRO_CALLCONV *retro_environment_t)(unsigned cmd, void *data);
+
+/* Render a frame. Pixel format is 15-bit 0RGB1555 native endian
+ * unless changed (see RETRO_ENVIRONMENT_SET_PIXEL_FORMAT).
+ *
+ * Width and height specify dimensions of buffer.
+ * Pitch specifices length in bytes between two lines in buffer.
+ *
+ * For performance reasons, it is highly recommended to have a frame
+ * that is packed in memory, i.e. pitch == width * byte_per_pixel.
+ * Certain graphic APIs, such as OpenGL ES, do not like textures
+ * that are not packed in memory.
+ */
+typedef void (RETRO_CALLCONV *retro_video_refresh_t)(const void *data, unsigned width,
+      unsigned height, size_t pitch);
+
+/* Renders a single audio frame. Should only be used if implementation
+ * generates a single sample at a time.
+ * Format is signed 16-bit native endian.
+ */
+typedef void (RETRO_CALLCONV *retro_audio_sample_t)(int16_t left, int16_t right);
+
+/* Renders multiple audio frames in one go.
+ *
+ * One frame is defined as a sample of left and right channels, interleaved.
+ * I.e. int16_t buf[4] = { l, r, l, r }; would be 2 frames.
+ * Only one of the audio callbacks must ever be used.
+ */
+typedef size_t (RETRO_CALLCONV *retro_audio_sample_batch_t)(const int16_t *data,
+      size_t frames);
+
+/* Polls input. */
+typedef void (RETRO_CALLCONV *retro_input_poll_t)(void);
+
+/* Queries for input for player 'port'. device will be masked with
+ * RETRO_DEVICE_MASK.
+ *
+ * Specialization of devices such as RETRO_DEVICE_JOYPAD_MULTITAP that
+ * have been set with retro_set_controller_port_device()
+ * will still use the higher level RETRO_DEVICE_JOYPAD to request input.
+ */
+typedef int16_t (RETRO_CALLCONV *retro_input_state_t)(unsigned port, unsigned device,
+      unsigned index, unsigned id);
+
+/* Sets callbacks. retro_set_environment() is guaranteed to be called
+ * before retro_init().
+ *
+ * The rest of the set_* functions are guaranteed to have been called
+ * before the first call to retro_run() is made. */
+RETRO_API void retro_set_environment(retro_environment_t);
+RETRO_API void retro_set_video_refresh(retro_video_refresh_t);
+RETRO_API void retro_set_audio_sample(retro_audio_sample_t);
+RETRO_API void retro_set_audio_sample_batch(retro_audio_sample_batch_t);
+RETRO_API void retro_set_input_poll(retro_input_poll_t);
+RETRO_API void retro_set_input_state(retro_input_state_t);
+
+/* Library global initialization/deinitialization. */
+RETRO_API void retro_init(void);
+RETRO_API void retro_deinit(void);
+
+/* Must return RETRO_API_VERSION. Used to validate ABI compatibility
+ * when the API is revised. */
+RETRO_API unsigned retro_api_version(void);
+
+/* Gets statically known system info. Pointers provided in *info
+ * must be statically allocated.
+ * Can be called at any time, even before retro_init(). */
+RETRO_API void retro_get_system_info(struct retro_system_info *info);
+
+/* Gets information about system audio/video timings and geometry.
+ * Can be called only after retro_load_game() has successfully completed.
+ * NOTE: The implementation of this function might not initialize every
+ * variable if needed.
+ * E.g. geom.aspect_ratio might not be initialized if core doesn't
+ * desire a particular aspect ratio. */
+RETRO_API void retro_get_system_av_info(struct retro_system_av_info *info);
+
+/* Sets device to be used for player 'port'.
+ * By default, RETRO_DEVICE_JOYPAD is assumed to be plugged into all
+ * available ports.
+ * Setting a particular device type is not a guarantee that libretro cores
+ * will only poll input based on that particular device type. It is only a
+ * hint to the libretro core when a core cannot automatically detect the
+ * appropriate input device type on its own. It is also relevant when a
+ * core can change its behavior depending on device type. */
+RETRO_API void retro_set_controller_port_device(unsigned port, unsigned device);
+
+/* Resets the current game. */
+RETRO_API void retro_reset(void);
+
+/* Runs the game for one video frame.
+ * During retro_run(), input_poll callback must be called at least once.
+ *
+ * If a frame is not rendered for reasons where a game "dropped" a frame,
+ * this still counts as a frame, and retro_run() should explicitly dupe
+ * a frame if GET_CAN_DUPE returns true.
+ * In this case, the video callback can take a NULL argument for data.
+ */
+RETRO_API void retro_run(void);
+
+/* Returns the amount of data the implementation requires to serialize
+ * internal state (save states).
+ * Between calls to retro_load_game() and retro_unload_game(), the
+ * returned size is never allowed to be larger than a previous returned
+ * value, to ensure that the frontend can allocate a save state buffer once.
+ */
+RETRO_API size_t retro_serialize_size(void);
+
+/* Serializes internal state. If failed, or size is lower than
+ * retro_serialize_size(), it should return false, true otherwise. */
+RETRO_API bool retro_serialize(void *data, size_t size);
+RETRO_API bool retro_unserialize(const void *data, size_t size);
+
+RETRO_API void retro_cheat_reset(void);
+RETRO_API void retro_cheat_set(unsigned index, bool enabled, const char *code);
+
+/* Loads a game. */
+RETRO_API bool retro_load_game(const struct retro_game_info *game);
+
+/* Loads a "special" kind of game. Should not be used,
+ * except in extreme cases. */
+RETRO_API bool retro_load_game_special(
+  unsigned game_type,
+  const struct retro_game_info *info, size_t num_info
+);
+
+/* Unloads a currently loaded game. */
+RETRO_API void retro_unload_game(void);
+
+/* Gets region of game. */
+RETRO_API unsigned retro_get_region(void);
+
+/* Gets region of memory. */
+RETRO_API void *retro_get_memory_data(unsigned id);
+RETRO_API size_t retro_get_memory_size(unsigned id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/libretro/libretro_d3d.h b/libretro/libretro_d3d.h
new file mode 100644
index 0000000000..2ed71aa7c0
--- /dev/null
+++ b/libretro/libretro_d3d.h
@@ -0,0 +1,60 @@
+/* Copyright (C) 2010-2016 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------------
+ * The following license statement only applies to this libretro API header (libretro_vulkan.h)
+ * ---------------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the
+ * "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef LIBRETRO_DIRECT3D_H__
+#define LIBRETRO_DIRECT3D_H__
+
+#include "libretro.h"
+
+#ifdef HAVE_D3D11
+
+#include <d3d11.h>
+#include <D3Dcompiler.h>
+
+#define RETRO_HW_RENDER_INTERFACE_D3D11_VERSION 1
+
+struct retro_hw_render_interface_d3d11
+{
+  /* Must be set to RETRO_HW_RENDER_INTERFACE_D3D11. */
+  enum retro_hw_render_interface_type interface_type;
+  /* Must be set to RETRO_HW_RENDER_INTERFACE_D3D11_VERSION. */
+  unsigned interface_version;
+
+  /* Opaque handle to the d3d11 backend in the frontend
+   * which must be passed along to all function pointers
+   * in this interface.
+   */
+  void* handle;
+  ID3D11Device *device;
+  ID3D11DeviceContext *context;
+  D3D_FEATURE_LEVEL featureLevel;
+  pD3DCompile D3DCompile;
+};
+
+
+#endif
+
+#endif /* LIBRETRO_DIRECT3D_H__ */
diff --git a/libretro/libretro_vulkan.cpp b/libretro/libretro_vulkan.cpp
new file mode 100644
index 0000000000..09e08703fe
--- /dev/null
+++ b/libretro/libretro_vulkan.cpp
@@ -0,0 +1,408 @@
+
+#include <cstring>
+#include <cassert>
+#include <vector>
+#include <mutex>
+#include <condition_variable>
+
+#define VK_NO_PROTOTYPES
+#include "libretro/libretro_vulkan.h"
+
+static retro_hw_render_interface_vulkan *vulkan;
+
+static struct {
+	VkInstance instance;
+	VkPhysicalDevice gpu;
+	VkSurfaceKHR surface;
+	PFN_vkGetInstanceProcAddr get_instance_proc_addr;
+	const char **required_device_extensions;
+	unsigned num_required_device_extensions;
+	const char **required_device_layers;
+	unsigned num_required_device_layers;
+	const VkPhysicalDeviceFeatures *required_features;
+} vk_init_info;
+static bool DEDICATED_ALLOCATION;
+
+extern PFN_vkCreateInstance vkCreateInstance;
+extern PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties;
+extern PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements;
+extern PFN_vkAllocateMemory vkAllocateMemory;
+extern PFN_vkBindImageMemory vkBindImageMemory;
+extern PFN_vkCreateImage vkCreateImage;
+extern PFN_vkDestroyImage vkDestroyImage;
+extern PFN_vkCreateImageView vkCreateImageView;
+extern PFN_vkDestroyImageView vkDestroyImageView;
+extern PFN_vkFreeMemory vkFreeMemory;
+
+#define VULKAN_MAX_SWAPCHAIN_IMAGES 8
+struct VkSwapchainKHR_T {
+	uint32_t count;
+	struct {
+		VkImage handle;
+		VkDeviceMemory memory;
+		retro_vulkan_image retro_image;
+	} images[VULKAN_MAX_SWAPCHAIN_IMAGES];
+	std::mutex mutex;
+	std::condition_variable condVar;
+	int current_index;
+};
+static VkSwapchainKHR_T chain;
+
+#define LIBRETRO_VK_WARP_LIST()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                \
+	LIBRETRO_VK_WARP_FUNC(vkDestroyInstance);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   \
+	LIBRETRO_VK_WARP_FUNC(vkCreateDevice);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      \
+	LIBRETRO_VK_WARP_FUNC(vkDestroyDevice);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     \
+	LIBRETRO_VK_WARP_FUNC(vkGetPhysicalDeviceSurfaceCapabilitiesKHR);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           \
+	LIBRETRO_VK_WARP_FUNC(vkDestroySurfaceKHR);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 \
+	LIBRETRO_VK_WARP_FUNC(vkCreateSwapchainKHR);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                \
+	LIBRETRO_VK_WARP_FUNC(vkGetSwapchainImagesKHR);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             \
+	LIBRETRO_VK_WARP_FUNC(vkAcquireNextImageKHR);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               \
+	LIBRETRO_VK_WARP_FUNC(vkQueuePresentKHR);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   \
+	LIBRETRO_VK_WARP_FUNC(vkDestroySwapchainKHR);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               \
+	LIBRETRO_VK_WARP_FUNC(vkQueueSubmit);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       \
+	LIBRETRO_VK_WARP_FUNC(vkQueueWaitIdle);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     \
+	LIBRETRO_VK_WARP_FUNC(vkCmdPipelineBarrier);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                \
+	LIBRETRO_VK_WARP_FUNC(vkCreateRenderPass)
+
+#define LIBRETRO_VK_WARP_FUNC(x)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               \
+	extern PFN_##x x;                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           \
+	PFN_##x x##_org
+
+LIBRETRO_VK_WARP_FUNC(vkGetInstanceProcAddr);
+LIBRETRO_VK_WARP_FUNC(vkGetDeviceProcAddr);
+LIBRETRO_VK_WARP_LIST();
+
+static VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance_libretro(const VkInstanceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkInstance *pInstance) {
+	*pInstance = vk_init_info.instance;
+	return VK_SUCCESS;
+}
+
+static void add_name_unique(std::vector<const char *> &list, const char *value) {
+	for (const char *name : list)
+		if (!strcmp(value, name))
+			return;
+
+	list.push_back(value);
+}
+static VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice_libretro(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) {
+	VkDeviceCreateInfo info = *pCreateInfo;
+	std::vector<const char *> EnabledLayerNames(info.ppEnabledLayerNames, info.ppEnabledLayerNames + info.enabledLayerCount);
+	std::vector<const char *> EnabledExtensionNames(info.ppEnabledExtensionNames, info.ppEnabledExtensionNames + info.enabledExtensionCount);
+	VkPhysicalDeviceFeatures EnabledFeatures = *info.pEnabledFeatures;
+
+	for (unsigned i = 0; i < vk_init_info.num_required_device_layers; i++)
+		add_name_unique(EnabledLayerNames, vk_init_info.required_device_layers[i]);
+
+	for (unsigned i = 0; i < vk_init_info.num_required_device_extensions; i++)
+		add_name_unique(EnabledExtensionNames, vk_init_info.required_device_extensions[i]);
+
+	add_name_unique(EnabledExtensionNames, VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME);
+	for (unsigned i = 0; i < sizeof(VkPhysicalDeviceFeatures) / sizeof(VkBool32); i++) {
+		if (((VkBool32 *)vk_init_info.required_features)[i])
+			((VkBool32 *)&EnabledFeatures)[i] = VK_TRUE;
+	}
+
+	for (auto extension_name : EnabledExtensionNames) {
+		if (!strcmp(extension_name, VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME))
+			DEDICATED_ALLOCATION = true;
+	}
+
+	info.enabledLayerCount = (uint32_t)EnabledLayerNames.size();
+	info.ppEnabledLayerNames = info.enabledLayerCount ? EnabledLayerNames.data() : nullptr;
+	info.enabledExtensionCount = (uint32_t)EnabledExtensionNames.size();
+	info.ppEnabledExtensionNames = info.enabledExtensionCount ? EnabledExtensionNames.data() : nullptr;
+	info.pEnabledFeatures = &EnabledFeatures;
+
+	return vkCreateDevice_org(physicalDevice, &info, pAllocator, pDevice);
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL vkCreateLibretroSurfaceKHR(VkInstance instance, const void *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface) {
+	*pSurface = vk_init_info.surface;
+	return VK_SUCCESS;
+}
+
+VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilitiesKHR_libretro(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) {
+	VkResult res = vkGetPhysicalDeviceSurfaceCapabilitiesKHR_org(physicalDevice, surface, pSurfaceCapabilities);
+	if (res == VK_SUCCESS) {
+		pSurfaceCapabilities->currentExtent.width = -1;
+		pSurfaceCapabilities->currentExtent.height = -1;
+	}
+	return res;
+}
+
+static bool MemoryTypeFromProperties(uint32_t typeBits, VkFlags requirements_mask, uint32_t *typeIndex) {
+	VkPhysicalDeviceMemoryProperties memory_properties;
+	vkGetPhysicalDeviceMemoryProperties(vulkan->gpu, &memory_properties);
+	// Search memtypes to find first index with those properties
+	for (uint32_t i = 0; i < 32; i++) {
+		if ((typeBits & 1) == 1) {
+			// Type is available, does it match user properties?
+			if ((memory_properties.memoryTypes[i].propertyFlags & requirements_mask) == requirements_mask) {
+				*typeIndex = i;
+				return true;
+			}
+		}
+		typeBits >>= 1;
+	}
+	// No memory types matched, return failure
+	return false;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR_libretro(VkDevice device, const VkSwapchainCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSwapchainKHR *pSwapchain) {
+	uint32_t swapchain_mask = vulkan->get_sync_index_mask(vulkan->handle);
+
+	chain.count = 0;
+	while (swapchain_mask) {
+		chain.count++;
+		swapchain_mask >>= 1;
+	}
+	assert(chain.count <= VULKAN_MAX_SWAPCHAIN_IMAGES);
+
+	for (uint32_t i = 0; i < chain.count; i++) {
+		{
+			VkImageCreateInfo info{ VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };
+			info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;
+			info.imageType = VK_IMAGE_TYPE_2D;
+			info.format = pCreateInfo->imageFormat;
+			info.extent.width = pCreateInfo->imageExtent.width;
+			info.extent.height = pCreateInfo->imageExtent.height;
+			info.extent.depth = 1;
+			info.mipLevels = 1;
+			info.arrayLayers = 1;
+			info.samples = VK_SAMPLE_COUNT_1_BIT;
+			info.tiling = VK_IMAGE_TILING_OPTIMAL;
+			info.usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+			info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+
+			vkCreateImage(device, &info, pAllocator, &chain.images[i].handle);
+		}
+
+		VkMemoryRequirements memreq;
+		vkGetImageMemoryRequirements(device, chain.images[i].handle, &memreq);
+
+		VkMemoryAllocateInfo alloc{ VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };
+		alloc.allocationSize = memreq.size;
+
+		VkMemoryDedicatedAllocateInfoKHR dedicated{ VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR };
+		if (DEDICATED_ALLOCATION) {
+			alloc.pNext = &dedicated;
+			dedicated.image = chain.images[i].handle;
+		}
+
+		MemoryTypeFromProperties(memreq.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &alloc.memoryTypeIndex);
+		VkResult res = vkAllocateMemory(device, &alloc, pAllocator, &chain.images[i].memory);
+		assert(res == VK_SUCCESS);
+		res = vkBindImageMemory(device, chain.images[i].handle, chain.images[i].memory, 0);
+		assert(res == VK_SUCCESS);
+
+		chain.images[i].retro_image.create_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+		chain.images[i].retro_image.create_info.image = chain.images[i].handle;
+		chain.images[i].retro_image.create_info.viewType = VK_IMAGE_VIEW_TYPE_2D;
+		chain.images[i].retro_image.create_info.format = pCreateInfo->imageFormat;
+		chain.images[i].retro_image.create_info.components = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_A };
+		chain.images[i].retro_image.create_info.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+		chain.images[i].retro_image.create_info.subresourceRange.layerCount = 1;
+		chain.images[i].retro_image.create_info.subresourceRange.levelCount = 1;
+		res = vkCreateImageView(device, &chain.images[i].retro_image.create_info, pAllocator, &chain.images[i].retro_image.image_view);
+		assert(res == VK_SUCCESS);
+
+		chain.images[i].retro_image.image_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+	}
+
+	chain.current_index = -1;
+	*pSwapchain = (VkSwapchainKHR)&chain;
+
+	return VK_SUCCESS;
+}
+static VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR_libretro(VkDevice device, VkSwapchainKHR swapchain_, uint32_t *pSwapchainImageCount, VkImage *pSwapchainImages) {
+	VkSwapchainKHR_T *swapchain = (VkSwapchainKHR_T *)swapchain_;
+	if (pSwapchainImages) {
+		assert(*pSwapchainImageCount <= swapchain->count);
+		for (int i = 0; i < *pSwapchainImageCount; i++)
+			pSwapchainImages[i] = swapchain->images[i].handle;
+	} else
+		*pSwapchainImageCount = swapchain->count;
+
+	return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR_libretro(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *pImageIndex) {
+	vulkan->wait_sync_index(vulkan->handle);
+	*pImageIndex = vulkan->get_sync_index(vulkan->handle);
+#if 0
+	vulkan->set_signal_semaphore(vulkan->handle, semaphore);
+#endif
+	return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL vkQueuePresentKHR_libretro(VkQueue queue, const VkPresentInfoKHR *pPresentInfo) {
+	VkSwapchainKHR_T *swapchain = (VkSwapchainKHR_T *)pPresentInfo->pSwapchains[0];
+	std::unique_lock<std::mutex> lock(swapchain->mutex);
+#if 0
+	if(chain.current_index >= 0)
+		chain.condVar.wait(lock);
+#endif
+
+	chain.current_index = pPresentInfo->pImageIndices[0];
+#if 0
+	vulkan->set_image(vulkan->handle, &swapchain->images[pPresentInfo->pImageIndices[0]].retro_image, pPresentInfo->waitSemaphoreCount, pPresentInfo->pWaitSemaphores, vulkan->queue_index);
+#else
+	vulkan->set_image(vulkan->handle, &swapchain->images[pPresentInfo->pImageIndices[0]].retro_image, 0, nullptr, vulkan->queue_index);
+#endif
+	swapchain->condVar.notify_all();
+
+	return VK_SUCCESS;
+}
+
+void vk_libretro_wait_for_presentation() {
+	std::unique_lock<std::mutex> lock(chain.mutex);
+	if (chain.current_index < 0)
+		chain.condVar.wait(lock);
+#if 0
+	chain.current_index = -1;
+	chain.condVar.notify_all();
+#endif
+}
+
+static VKAPI_ATTR void VKAPI_CALL vkDestroyInstance_libretro(VkInstance instance, const VkAllocationCallbacks *pAllocator) {}
+static VKAPI_ATTR void VKAPI_CALL vkDestroyDevice_libretro(VkDevice device, const VkAllocationCallbacks *pAllocator) {}
+static VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR_libretro(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *pAllocator) {}
+static VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR_libretro(VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks *pAllocator) {
+	for (int i = 0; i < chain.count; i++) {
+		vkDestroyImage(device, chain.images[i].handle, pAllocator);
+		vkDestroyImageView(device, chain.images[i].retro_image.image_view, pAllocator);
+		vkFreeMemory(device, chain.images[i].memory, pAllocator);
+	}
+
+	memset(&chain.images, 0x00, sizeof(chain.images));
+	chain.count = 0;
+	chain.current_index = -1;
+}
+
+VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit_libretro(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence) {
+	VkResult res = VK_SUCCESS;
+
+#if 0
+	for(int i = 0; i < submitCount; i++)
+		vulkan->set_command_buffers(vulkan->handle, pSubmits[i].commandBufferCount, pSubmits[i].pCommandBuffers);
+#else
+#if 1
+	for (int i = 0; i < submitCount; i++) {
+		((VkSubmitInfo *)pSubmits)[i].waitSemaphoreCount = 0;
+		((VkSubmitInfo *)pSubmits)[i].pWaitSemaphores = nullptr;
+		((VkSubmitInfo *)pSubmits)[i].signalSemaphoreCount = 0;
+		((VkSubmitInfo *)pSubmits)[i].pSignalSemaphores = nullptr;
+	}
+#endif
+	vulkan->lock_queue(vulkan->handle);
+	res = vkQueueSubmit_org(queue, submitCount, pSubmits, fence);
+	vulkan->unlock_queue(vulkan->handle);
+#endif
+
+	return res;
+}
+
+VKAPI_ATTR VkResult VKAPI_CALL vkQueueWaitIdle_libretro(VkQueue queue) {
+	vulkan->lock_queue(vulkan->handle);
+	VkResult res = vkQueueWaitIdle_org(queue);
+	vulkan->unlock_queue(vulkan->handle);
+	return res;
+}
+
+VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier_libretro(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier *pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier *pImageMemoryBarriers) {
+	VkImageMemoryBarrier *barriers = (VkImageMemoryBarrier *)pImageMemoryBarriers;
+	for (int i = 0; i < imageMemoryBarrierCount; i++) {
+		if (pImageMemoryBarriers[i].oldLayout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR) {
+			barriers[i].oldLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+			barriers[i].srcAccessMask = VK_ACCESS_SHADER_READ_BIT;
+		}
+		if (pImageMemoryBarriers[i].newLayout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR) {
+			barriers[i].newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+			barriers[i].dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
+		}
+	}
+	return vkCmdPipelineBarrier_org(commandBuffer, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, pMemoryBarriers, bufferMemoryBarrierCount, pBufferMemoryBarriers, imageMemoryBarrierCount, barriers);
+}
+
+VKAPI_ATTR VkResult VKAPI_CALL vkCreateRenderPass_libretro(VkDevice device, const VkRenderPassCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass) {
+	if (pCreateInfo->pAttachments[0].finalLayout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR)
+		((VkAttachmentDescription *)pCreateInfo->pAttachments)[0].finalLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+
+	return vkCreateRenderPass_org(device, pCreateInfo, pAllocator, pRenderPass);
+}
+
+#undef LIBRETRO_VK_WARP_FUNC
+#define LIBRETRO_VK_WARP_FUNC(x)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               \
+	do {                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        \
+		if (!strcmp(pName, #x)) {                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                \
+			x##_org = (PFN_##x)fptr;                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              \
+			return (PFN_vkVoidFunction)x##_libretro;                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              \
+		}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        \
+	} while (0)
+
+VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr_libretro(VkInstance instance, const char *pName) {
+	if (false
+#ifdef _WIN32
+		 || !strcmp(pName, "vkCreateWin32SurfaceKHR")
+#endif
+#ifdef __ANDROID__
+		 || !strcmp(pName, "vkCreateAndroidSurfaceKHR")
+#endif
+#ifdef VK_USE_PLATFORM_XLIB_KHR
+		 || !strcmp(pName, "vkCreateXlibSurfaceKHR")
+#endif
+#ifdef VK_USE_PLATFORM_XCB_KHR
+		 || !strcmp(pName, "vkCreateXcbSurfaceKHR")
+#endif
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+		 || !strcmp(pName, "vkCreateWaylandSurfaceKHR")
+#endif
+	) {
+		return (PFN_vkVoidFunction)vkCreateLibretroSurfaceKHR;
+	}
+
+	PFN_vkVoidFunction fptr = vkGetInstanceProcAddr_org(instance, pName);
+	if (!fptr)
+		return fptr;
+
+	LIBRETRO_VK_WARP_LIST();
+
+	return fptr;
+}
+
+VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr_libretro(VkDevice device, const char *pName) {
+	PFN_vkVoidFunction fptr = vkGetDeviceProcAddr_org(device, pName);
+	if (!fptr)
+		return fptr;
+
+	LIBRETRO_VK_WARP_LIST();
+
+	return fptr;
+}
+
+void vk_libretro_init(VkInstance instance, VkPhysicalDevice gpu, VkSurfaceKHR surface, PFN_vkGetInstanceProcAddr get_instance_proc_addr, const char **required_device_extensions, unsigned num_required_device_extensions, const char **required_device_layers, unsigned num_required_device_layers, const VkPhysicalDeviceFeatures *required_features) {
+	assert(surface);
+
+	vk_init_info.instance = instance;
+	vk_init_info.gpu = gpu;
+	vk_init_info.surface = surface;
+	vk_init_info.get_instance_proc_addr = get_instance_proc_addr;
+	vk_init_info.required_device_extensions = required_device_extensions;
+	vk_init_info.num_required_device_extensions = num_required_device_extensions;
+	vk_init_info.required_device_layers = required_device_layers;
+	vk_init_info.num_required_device_layers = num_required_device_layers;
+	vk_init_info.required_features = required_features;
+
+	vkGetInstanceProcAddr_org = vkGetInstanceProcAddr;
+	vkGetInstanceProcAddr = vkGetInstanceProcAddr_libretro;
+	vkGetDeviceProcAddr_org = vkGetDeviceProcAddr;
+	vkGetDeviceProcAddr = vkGetDeviceProcAddr_libretro;
+	vkCreateInstance = vkCreateInstance_libretro;
+}
+
+void vk_libretro_set_hwrender_interface(retro_hw_render_interface *hw_render_interface) { vulkan = (retro_hw_render_interface_vulkan *)hw_render_interface; }
+void vk_libretro_shutdown() {
+	memset(&vk_init_info, 0x00, sizeof(vk_init_info));
+	vulkan = NULL;
+	DEDICATED_ALLOCATION = false;
+}
diff --git a/libretro/libretro_vulkan.h b/libretro/libretro_vulkan.h
new file mode 100644
index 0000000000..9d9aa44775
--- /dev/null
+++ b/libretro/libretro_vulkan.h
@@ -0,0 +1,403 @@
+/* Copyright (C) 2010-2016 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------------
+ * The following license statement only applies to this libretro API header (libretro_vulkan.h)
+ * ---------------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the
+ * "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef LIBRETRO_VULKAN_H__
+#define LIBRETRO_VULKAN_H__
+
+#include "ext/vulkan/vulkan.h"
+#include "libretro.h"
+
+#define RETRO_HW_RENDER_INTERFACE_VULKAN_VERSION 5
+#define RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN_VERSION 1
+
+struct retro_vulkan_image
+{
+  VkImageView image_view;
+  VkImageLayout image_layout;
+  VkImageViewCreateInfo create_info;
+};
+
+typedef void (*retro_vulkan_set_image_t)(void* handle, const struct retro_vulkan_image* image,
+                                         uint32_t num_semaphores, const VkSemaphore* semaphores,
+                                         uint32_t src_queue_family);
+
+typedef uint32_t (*retro_vulkan_get_sync_index_t)(void* handle);
+typedef uint32_t (*retro_vulkan_get_sync_index_mask_t)(void* handle);
+typedef void (*retro_vulkan_set_command_buffers_t)(void* handle, uint32_t num_cmd,
+                                                   const VkCommandBuffer* cmd);
+typedef void (*retro_vulkan_wait_sync_index_t)(void* handle);
+typedef void (*retro_vulkan_lock_queue_t)(void* handle);
+typedef void (*retro_vulkan_unlock_queue_t)(void* handle);
+typedef void (*retro_vulkan_set_signal_semaphore_t)(void* handle, VkSemaphore semaphore);
+
+typedef const VkApplicationInfo* (*retro_vulkan_get_application_info_t)(void);
+
+struct retro_vulkan_context
+{
+  VkPhysicalDevice gpu;
+  VkDevice device;
+  VkQueue queue;
+  uint32_t queue_family_index;
+  VkQueue presentation_queue;
+  uint32_t presentation_queue_family_index;
+};
+
+typedef bool (*retro_vulkan_create_device_t)(
+    struct retro_vulkan_context* context, VkInstance instance, VkPhysicalDevice gpu,
+    VkSurfaceKHR surface, PFN_vkGetInstanceProcAddr get_instance_proc_addr,
+    const char** required_device_extensions, unsigned num_required_device_extensions,
+    const char** required_device_layers, unsigned num_required_device_layers,
+    const VkPhysicalDeviceFeatures* required_features);
+
+typedef void (*retro_vulkan_destroy_device_t)(void);
+
+/* Note on thread safety:
+ * The Vulkan API is heavily designed around multi-threading, and
+ * the libretro interface for it should also be threading friendly.
+ * A core should be able to build command buffers and submit
+ * command buffers to the GPU from any thread.
+ */
+
+struct retro_hw_render_context_negotiation_interface_vulkan
+{
+  /* Must be set to RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN. */
+  enum retro_hw_render_context_negotiation_interface_type interface_type;
+  /* Must be set to RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN_VERSION. */
+  unsigned interface_version;
+
+  /* If non-NULL, returns a VkApplicationInfo struct that the frontend can use instead of
+   * its "default" application info.
+   */
+  retro_vulkan_get_application_info_t get_application_info;
+
+  /* If non-NULL, the libretro core will choose one or more physical devices,
+   * create one or more logical devices and create one or more queues.
+   * The core must prepare a designated PhysicalDevice, Device, Queue and queue family index
+   * which the frontend will use for its internal operation.
+   *
+   * If gpu is not VK_NULL_HANDLE, the physical device provided to the frontend must be this
+   * PhysicalDevice.
+   * The core is still free to use other physical devices.
+   *
+   * The frontend will request certain extensions and layers for a device which is created.
+   * The core must ensure that the queue and queue_family_index support GRAPHICS and COMPUTE.
+   *
+   * If surface is not VK_NULL_HANDLE, the core must consider presentation when creating the queues.
+   * If presentation to "surface" is supported on the queue, presentation_queue must be equal to
+   * queue.
+   * If not, a second queue must be provided in presentation_queue and presentation_queue_index.
+   * If surface is not VK_NULL_HANDLE, the instance from frontend will have been created with
+   * supported for
+   * VK_KHR_surface extension.
+   *
+   * The core is free to set its own queue priorities.
+   * Device provided to frontend is owned by the frontend, but any additional device resources must
+   * be freed by core
+   * in destroy_device callback.
+   *
+   * If this function returns true, a PhysicalDevice, Device and Queues are initialized.
+   * If false, none of the above have been initialized and the frontend will attempt
+   * to fallback to "default" device creation, as if this function was never called.
+   */
+  retro_vulkan_create_device_t create_device;
+
+  /* If non-NULL, this callback is called similar to context_destroy for HW_RENDER_INTERFACE.
+   * However, it will be called even if context_reset was not called.
+   * This can happen if the context never succeeds in being created.
+   * destroy_device will always be called before the VkInstance
+   * of the frontend is destroyed if create_device was called successfully so that the core has a
+   * chance of
+   * tearing down its own device resources.
+   *
+   * Only auxillary resources should be freed here, i.e. resources which are not part of
+   * retro_vulkan_context.
+   */
+  retro_vulkan_destroy_device_t destroy_device;
+};
+
+struct retro_hw_render_interface_vulkan
+{
+  /* Must be set to RETRO_HW_RENDER_INTERFACE_VULKAN. */
+  enum retro_hw_render_interface_type interface_type;
+  /* Must be set to RETRO_HW_RENDER_INTERFACE_VULKAN_VERSION. */
+  unsigned interface_version;
+
+  /* Opaque handle to the Vulkan backend in the frontend
+   * which must be passed along to all function pointers
+   * in this interface.
+   *
+   * The rationale for including a handle here (which libretro v1
+   * doesn't currently do in general) is:
+   *
+   * - Vulkan cores should be able to be freely threaded without lots of fuzz.
+   *   This would break frontends which currently rely on TLS
+   *   to deal with multiple cores loaded at the same time.
+   * - Fixing this in general is TODO for an eventual libretro v2.
+   */
+  void* handle;
+
+  /* The Vulkan instance the context is using. */
+  VkInstance instance;
+  /* The physical device used. */
+  VkPhysicalDevice gpu;
+  /* The logical device used. */
+  VkDevice device;
+
+  /* Allows a core to fetch all its needed symbols without having to link
+   * against the loader itself. */
+  PFN_vkGetDeviceProcAddr get_device_proc_addr;
+  PFN_vkGetInstanceProcAddr get_instance_proc_addr;
+
+  /* The queue the core must use to submit data.
+   * This queue and index must remain constant throughout the lifetime
+   * of the context.
+   *
+   * This queue will be the queue that supports graphics and compute
+   * if the device supports compute.
+   */
+  VkQueue queue;
+  unsigned queue_index;
+
+  /* Before calling retro_video_refresh_t with RETRO_HW_FRAME_BUFFER_VALID,
+   * set which image to use for this frame.
+   *
+   * If num_semaphores is non-zero, the frontend will wait for the
+   * semaphores provided to be signaled before using the results further
+   * in the pipeline.
+   *
+   * Semaphores provided by a single call to set_image will only be
+   * waited for once (waiting for a semaphore resets it).
+   * E.g. set_image, video_refresh, and then another
+   * video_refresh without set_image,
+   * but same image will only wait for semaphores once.
+   *
+   * For this reason, ownership transfer will only occur if semaphores
+   * are waited on for a particular frame in the frontend.
+   *
+   * Using semaphores is optional for synchronization purposes,
+   * but if not using
+   * semaphores, an image memory barrier in vkCmdPipelineBarrier
+   * should be used in the graphics_queue.
+   * Example:
+   *
+   * vkCmdPipelineBarrier(cmd,
+   *    srcStageMask = VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
+   *    dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+   *    image_memory_barrier = {
+   *       srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+   *       dstAccessMask = VK_ACCESS_SHADER_READ_BIT,
+   *    });
+   *
+   * The use of pipeline barriers instead of semaphores is encouraged
+   * as it is simpler and more fine-grained. A layout transition
+   * must generally happen anyways which requires a
+   * pipeline barrier.
+   *
+   * The image passed to set_image must have imageUsage flags set to at least
+   * VK_IMAGE_USAGE_TRANSFER_SRC_BIT and VK_IMAGE_USAGE_SAMPLED_BIT.
+   * The core will naturally want to use flags such as
+   * VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT and/or
+   * VK_IMAGE_USAGE_TRANSFER_DST_BIT depending
+   * on how the final image is created.
+   *
+   * The image must also have been created with MUTABLE_FORMAT bit set if
+   * 8-bit formats are used, so that the frontend can reinterpret sRGB
+   * formats as it sees fit.
+   *
+   * Images passed to set_image should be created with TILING_OPTIMAL.
+   * The image layout should be transitioned to either
+   * VK_IMAGE_LAYOUT_GENERIC or VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL.
+   * The actual image layout used must be set in image_layout.
+   *
+   * The image must be a 2D texture which may or not be layered
+   * and/or mipmapped.
+   *
+   * The image must be suitable for linear sampling.
+   * While the image_view is typically the only field used,
+   * the frontend may want to reinterpret the texture as sRGB vs.
+   * non-sRGB for example so the VkImageViewCreateInfo used to
+   * create the image view must also be passed in.
+   *
+   * The data in the pointer to the image struct will not be copied
+   * as the pNext field in create_info cannot be reliably deep-copied.
+   * The image pointer passed to set_image must be valid until
+   * retro_video_refresh_t has returned.
+   *
+   * If frame duping is used when passing NULL to retro_video_refresh_t,
+   * the frontend is free to either use the latest image passed to
+   * set_image or reuse the older pointer passed to set_image the
+   * frame RETRO_HW_FRAME_BUFFER_VALID was last used.
+   *
+   * Essentially, the lifetime of the pointer passed to
+   * set_image should be extended if frame duping is used
+   * so that the frontend can reuse the older pointer.
+   *
+   * The image itself however, must not be touched by the core until
+   * wait_sync_index has been completed later. The frontend may perform
+   * layout transitions on the image, so even read-only access is not defined.
+   * The exception to read-only rule is if GENERAL layout is used for the image.
+   * In this case, the frontend is not allowed to perform any layout transitions,
+   * so concurrent reads from core and frontend are allowed.
+   *
+   * If frame duping is used, or if set_command_buffers is used,
+   * the frontend will not wait for any semaphores.
+   *
+   * The src_queue_family is used to specify which queue family
+   * the image is currently owned by. If using multiple queue families
+   * (e.g. async compute), the frontend will need to acquire ownership of the
+   * image before rendering with it and release the image afterwards.
+   *
+   * If src_queue_family is equal to the queue family (queue_index),
+   * no ownership transfer will occur.
+   * Similarly, if src_queue_family is VK_QUEUE_FAMILY_IGNORED,
+   * no ownership transfer will occur.
+   *
+   * The frontend will always release ownership back to src_queue_family.
+   * Waiting for frontend to complete with wait_sync_index() ensures that
+   * the frontend has released ownership back to the application.
+   * Note that in Vulkan, transfering ownership is a two-part process.
+   *
+   * Example frame:
+   *  - core releases ownership from src_queue_index to queue_index with VkImageMemoryBarrier.
+   *  - core calls set_image with src_queue_index.
+   *  - Frontend will acquire the image with src_queue_index -> queue_index as well, completing the
+   * ownership transfer.
+   *  - Frontend renders the frame.
+   *  - Frontend releases ownership with queue_index -> src_queue_index.
+   *  - Next time image is used, core must acquire ownership from queue_index ...
+   *
+   * Since the frontend releases ownership, we cannot necessarily dupe the frame because
+   * the core needs to make the roundtrip of ownership transfer.
+   */
+  retro_vulkan_set_image_t set_image;
+
+  /* Get the current sync index for this frame which is obtained in
+   * frontend by calling e.g. vkAcquireNextImageKHR before calling
+   * retro_run().
+   *
+   * This index will correspond to which swapchain buffer is currently
+   * the active one.
+   *
+   * Knowing this index is very useful for maintaining safe asynchronous CPU
+   * and GPU operation without stalling.
+   *
+   * The common pattern for synchronization is to receive fences when
+   * submitting command buffers to Vulkan (vkQueueSubmit) and add this fence
+   * to a list of fences for frame number get_sync_index().
+   *
+   * Next time we receive the same get_sync_index(), we can wait for the
+   * fences from before, which will usually return immediately as the
+   * frontend will generally also avoid letting the GPU run ahead too much.
+   *
+   * After the fence has signaled, we know that the GPU has completed all
+   * GPU work related to work submitted in the frame we last saw get_sync_index().
+   *
+   * This means we can safely reuse or free resources allocated in this frame.
+   *
+   * In theory, even if we wait for the fences correctly, it is not technically
+   * safe to write to the image we earlier passed to the frontend since we're
+   * not waiting for the frontend GPU jobs to complete.
+   *
+   * The frontend will guarantee that the appropriate pipeline barrier
+   * in graphics_queue has been used such that
+   * VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT cannot
+   * start until the frontend is done with the image.
+   */
+  retro_vulkan_get_sync_index_t get_sync_index;
+
+  /* Returns a bitmask of how many swapchain images we currently have
+   * in the frontend.
+   *
+   * If bit #N is set in the return value, get_sync_index can return N.
+   * Knowing this value is useful for preallocating per-frame management
+   * structures ahead of time.
+   *
+   * While this value will typically remain constant throughout the
+   * applications lifecycle, it may for example change if the frontend
+   * suddently changes fullscreen state and/or latency.
+   *
+   * If this value ever changes, it is safe to assume that the device
+   * is completely idle and all synchronization objects can be deleted
+   * right away as desired.
+   */
+  retro_vulkan_get_sync_index_mask_t get_sync_index_mask;
+
+  /* Instead of submitting the command buffer to the queue first, the core
+   * can pass along its command buffer to the frontend, and the frontend
+   * will submit the command buffer together with the frontends command buffers.
+   *
+   * This has the advantage that the overhead of vkQueueSubmit can be
+   * amortized into a single call. For this mode, semaphores in set_image
+   * will be ignored, so vkCmdPipelineBarrier must be used to synchronize
+   * the core and frontend.
+   *
+   * The command buffers in set_command_buffers are only executed once,
+   * even if frame duping is used.
+   *
+   * If frame duping is used, set_image should be used for the frames
+   * which should be duped instead.
+   *
+   * Command buffers passed to the frontend with set_command_buffers
+   * must not actually be submitted to the GPU until retro_video_refresh_t
+   * is called.
+   *
+   * The frontend must submit the command buffer before submitting any
+   * other command buffers provided by set_command_buffers. */
+  retro_vulkan_set_command_buffers_t set_command_buffers;
+
+  /* Waits on CPU for device activity for the current sync index to complete.
+   * This is useful since the core will not have a relevant fence to sync with
+   * when the frontend is submitting the command buffers. */
+  retro_vulkan_wait_sync_index_t wait_sync_index;
+
+  /* If the core submits command buffers itself to any of the queues provided
+   * in this interface, the core must lock and unlock the frontend from
+   * racing on the VkQueue.
+   *
+   * Queue submission can happen on any thread.
+   * Even if queue submission happens on the same thread as retro_run(),
+   * the lock/unlock functions must still be called.
+   *
+   * NOTE: Queue submissions are heavy-weight. */
+  retro_vulkan_lock_queue_t lock_queue;
+  retro_vulkan_unlock_queue_t unlock_queue;
+
+  /* Sets a semaphore which is signaled when the image in set_image can safely be reused.
+   * The semaphore is consumed next call to retro_video_refresh_t.
+   * The semaphore will be signalled even for duped frames.
+   * The semaphore will be signalled only once, so set_signal_semaphore should be called every
+   * frame.
+   * The semaphore may be VK_NULL_HANDLE, which disables semaphore signalling for next call to
+   * retro_video_refresh_t.
+   *
+   * This is mostly useful to support use cases where you're rendering to a single image that
+   * is recycled in a ping-pong fashion with the frontend to save memory (but potentially less
+   * throughput).
+   */
+  retro_vulkan_set_signal_semaphore_t set_signal_semaphore;
+};
+
+#endif
diff --git a/libretro/link.T b/libretro/link.T
new file mode 100644
index 0000000000..b0c262db9e
--- /dev/null
+++ b/libretro/link.T
@@ -0,0 +1,5 @@
+{
+   global: retro_*;
+   local: *;
+};
+
diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp
index 13f9120f3c..5a91f21e02 100644
--- a/unittest/UnitTest.cpp
+++ b/unittest/UnitTest.cpp
@@ -43,6 +43,7 @@
 #include "Core/Config.h"
 #include "Core/MIPS/MIPSVFPUUtils.h"
 #include "Core/FileSystems/ISOFileSystem.h"
+#include "GPU/Common/TextureDecoder.h"
 
 #include "unittest/JitHarness.h"
 #include "unittest/TestVertexJit.h"
@@ -401,6 +402,63 @@ bool TestParseLBN() {
 	return true;
 }
 
+// So we can use EXPECT_TRUE, etc.
+struct AlignedMem {
+	AlignedMem(size_t sz, size_t alignment = 16) {
+		p_ = AllocateAlignedMemory(sz, alignment);
+	}
+	~AlignedMem() {
+		FreeAlignedMemory(p_);
+	}
+
+	operator void *() {
+		return p_;
+	}
+
+	operator char *() {
+		return (char *)p_;
+	}
+
+private:
+	void *p_;
+};
+
+bool TestQuickTexHash() {
+	SetupTextureDecoder();
+
+	static const int BUF_SIZE = 1024;
+	AlignedMem buf(BUF_SIZE, 16);
+
+	memset(buf, 0, BUF_SIZE);
+	EXPECT_EQ_HEX(DoQuickTexHash(buf, BUF_SIZE), 0xaa756edc);
+
+	memset(buf, 1, BUF_SIZE);
+	EXPECT_EQ_HEX(DoQuickTexHash(buf, BUF_SIZE), 0x66f81b1c);
+
+	strncpy(buf, "hello", BUF_SIZE);
+	EXPECT_EQ_HEX(DoQuickTexHash(buf, BUF_SIZE), 0xf6028131);
+
+	strncpy(buf, "goodbye", BUF_SIZE);
+	EXPECT_EQ_HEX(DoQuickTexHash(buf, BUF_SIZE), 0xef81b54f);
+
+	// Simple patterns.
+	for (int i = 0; i < BUF_SIZE; ++i) {
+		char *p = buf;
+		p[i] = i & 0xFF;
+	}
+	EXPECT_EQ_HEX(DoQuickTexHash(buf, BUF_SIZE), 0x0d64531c);
+
+	int j = 573;
+	for (int i = 0; i < BUF_SIZE; ++i) {
+		char *p = buf;
+		j += ((i * 7) + (i & 3)) * 11;
+		p[i] = j & 0xFF;
+	}
+	EXPECT_EQ_HEX(DoQuickTexHash(buf, BUF_SIZE), 0x58de8dbc);
+
+	return false;
+}
+
 typedef bool (*TestFunc)();
 struct TestItem {
 	const char *name;
@@ -432,6 +490,7 @@ TestItem availableTests[] = {
 	TEST_ITEM(Jit),
 	TEST_ITEM(MatrixTranspose),
 	TEST_ITEM(ParseLBN),
+	TEST_ITEM(QuickTexHash),
 };
 
 int main(int argc, const char *argv[]) {
diff --git a/unittest/UnitTest.h b/unittest/UnitTest.h
index 2cb26caddc..e953925d39 100644
--- a/unittest/UnitTest.h
+++ b/unittest/UnitTest.h
@@ -3,6 +3,7 @@
 #define EXPECT_TRUE(a) if (!(a)) { printf("%s:%i: Test Fail\n", __FUNCTION__, __LINE__); return false; }
 #define EXPECT_FALSE(a) if ((a)) { printf("%s:%i: Test Fail\n", __FUNCTION__, __LINE__); return false; }
 #define EXPECT_EQ_INT(a, b) if ((a) != (b)) { printf("%s:%i: Test Fail\n%d\nvs\n%d\n", __FUNCTION__, __LINE__, a, b); return false; }
+#define EXPECT_EQ_HEX(a, b) if ((a) != (b)) { printf("%s:%i: Test Fail\n%x\nvs\n%x\n", __FUNCTION__, __LINE__, a, b); return false; }
 #define EXPECT_EQ_FLOAT(a, b) if ((a) != (b)) { printf("%s:%i: Test Fail\n%f\nvs\n%f\n", __FUNCTION__, __LINE__, a, b); return false; }
 #define EXPECT_APPROX_EQ_FLOAT(a, b) if (fabsf((a)-(b))>0.00001f) { printf("%s:%i: Test Fail\n%f\nvs\n%f\n", __FUNCTION__, __LINE__, a, b); /*return false;*/ }
 #define EXPECT_EQ_STR(a, b) if (a != b) { printf("%s: Test Fail\n%s\nvs\n%s\n", __FUNCTION__, a.c_str(), b.c_str()); return false; }