diff --git a/mednafen/cdrom/CDAccess_Image.cpp b/mednafen/cdrom/CDAccess_Image.cpp
index 9d2ba5fe..e1d0cd4a 100644
--- a/mednafen/cdrom/CDAccess_Image.cpp
+++ b/mednafen/cdrom/CDAccess_Image.cpp
@@ -639,7 +639,7 @@ bool CDAccess_Image::ImageOpen(const char *path, bool image_memcache)
             TmpTrack.fp = new FileStream(efn.c_str(), MODE_READ);
             TmpTrack.FirstFileInstance = 1;
 
-            if (TmpTrack.fp->tell() == UINT64_C(-1))
+            if (TmpTrack.fp->tell() == (uint64_t)-1)
                return false;
 
             if(image_memcache)
diff --git a/msvc/mednafen_psx_hw_libretro.vcxproj b/msvc/mednafen_psx_hw_libretro.vcxproj
index d830c13d..563d3e65 100644
--- a/msvc/mednafen_psx_hw_libretro.vcxproj
+++ b/msvc/mednafen_psx_hw_libretro.vcxproj
@@ -173,7 +173,12 @@
     <ClCompile Include="..\mednafen\psx\mdec.cpp" />
     <ClCompile Include="..\mednafen\psx\sio.cpp" />
     <ClCompile Include="..\mednafen\psx\spu.cpp" />
-    <ClCompile Include="..\mednafen\psx\timer.cpp" />
+    <ClCompile Include="..\mednafen\psx\timer.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)mednafen\psx\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)mednafen\psx\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)mednafen\psx\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)mednafen\psx\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\mednafen\settings.cpp" />
     <ClCompile Include="..\mednafen\state.cpp" />
     <ClCompile Include="..\mednafen\Stream.cpp" />
@@ -201,24 +206,38 @@
     <ClCompile Include="..\mednafen\video\surface.cpp" />
     <ClCompile Include="..\parallel-psx\atlas\atlas.cpp" />
     <ClCompile Include="..\parallel-psx\renderer\renderer.cpp" />
+    <ClCompile Include="..\parallel-psx\SPIRV-Cross\spirv_cfg.cpp" />
+    <ClCompile Include="..\parallel-psx\SPIRV-Cross\spirv_cross.cpp" />
+    <ClCompile Include="..\parallel-psx\SPIRV-Cross\spirv_cross_parsed_ir.cpp" />
+    <ClCompile Include="..\parallel-psx\SPIRV-Cross\spirv_parser.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\buffer.cpp" />
-    <ClCompile Include="..\parallel-psx\vulkan\chain_allocator.cpp" />
+    <ClCompile Include="..\parallel-psx\vulkan\buffer_pool.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\command_buffer.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\command_pool.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\cookie.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\descriptor_set.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\device.cpp" />
+    <ClCompile Include="..\parallel-psx\vulkan\event_manager.cpp" />
+    <ClCompile Include="..\parallel-psx\vulkan\fence.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\fence_manager.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\image.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\memory_allocator.cpp" />
+    <ClCompile Include="..\parallel-psx\vulkan\pipeline_event.cpp" />
+    <ClCompile Include="..\parallel-psx\vulkan\query_pool.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\render_pass.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\sampler.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\semaphore.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\semaphore_manager.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\shader.cpp" />
-    <ClCompile Include="..\parallel-psx\vulkan\SPIRV-Cross\spirv_cross.cpp" />
+    <ClCompile Include="..\parallel-psx\vulkan\texture_format.cpp" />
     <ClCompile Include="..\parallel-psx\vulkan\vulkan.cpp" />
-    <ClCompile Include="..\parallel-psx\vulkan\vulkan_symbol_wrapper.cpp" />
+    <ClCompile Include="..\parallel-psx\vulkan\wsi.cpp" />
+    <ClCompile Include="..\parallel-psx\vulkan\wsi_timing.cpp" />
+    <ClCompile Include="..\parallel-psx\volk\volk.c" />
+    <ClCompile Include="..\parallel-psx\util\cli_parser.cpp" />
+    <ClCompile Include="..\parallel-psx\util\dynamic_library.cpp" />
+    <ClCompile Include="..\parallel-psx\util\timer.cpp" />
+    <ClCompile Include="..\parallel-psx\util\util.cpp" />
     <ClCompile Include="..\pgxp\pgxp_cpu.c" />
     <ClCompile Include="..\pgxp\pgxp_debug.c" />
     <ClCompile Include="..\pgxp\pgxp_gpu.c" />
@@ -304,7 +323,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;$(ProjectDir);$(ProjectDir)../parallel-psx/vulkan/SPIRV-Cross;$(ProjectDir)../parallel-psx/renderer;$(ProjectDir)../parallel-psx/khronos/include;$(ProjectDir)../parallel-psx/atlas;$(ProjectDir)../parallel-psx/glsl/prebuilt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;$(ProjectDir);$(ProjectDir)../parallel-psx/SPIRV-Cross;$(ProjectDir)../parallel-psx/renderer;$(ProjectDir)../parallel-psx/util;$(ProjectDir)../parallel-psx/volk;$(ProjectDir)../parallel-psx/khronos/include;$(ProjectDir)../parallel-psx/atlas;$(ProjectDir)../parallel-psx/glsl/prebuilt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_OPENGL;CORE;HAVE_HW;HAVE_PBP;HAVE_THREADS;NEED_DEINTERLACER;WANT_32BPP;NEED_CD;HAVE_CHD;_7ZIP_ST;PACKAGE_VERSION="1.3.2";FLAC_API_EXPORTS;FLAC__HAS_OGG=0;HAVE_LROUND;HAVE_STDINT_H;HAVE_SYS_PARAM_H;HAVE_FSEEKO;PACKAGE="mednafen";MEDNAFEN_VERSION_NUMERIC=9386;__LIBRETRO__;_LOW_ACCURACY_;_FILE_OFFSET_BITS=64;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__ORDER_LITTLE_ENDIAN__;__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__;HAVE_VULKAN;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
@@ -319,7 +338,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;$(ProjectDir);$(ProjectDir)../parallel-psx/vulkan/SPIRV-Cross;$(ProjectDir)../parallel-psx/renderer;$(ProjectDir)../parallel-psx/khronos/include;$(ProjectDir)../parallel-psx/atlas;$(ProjectDir)../parallel-psx/glsl/prebuilt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;$(ProjectDir);$(ProjectDir)../parallel-psx/SPIRV-Cross;$(ProjectDir)../parallel-psx/renderer;$(ProjectDir)../parallel-psx/util;$(ProjectDir)../parallel-psx/volk;$(ProjectDir)../parallel-psx/khronos/include;$(ProjectDir)../parallel-psx/atlas;$(ProjectDir)../parallel-psx/glsl/prebuilt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_OPENGL;CORE;HAVE_HW;HAVE_PBP;HAVE_THREADS;NEED_DEINTERLACER;WANT_32BPP;NEED_CD;HAVE_CHD;_7ZIP_ST;PACKAGE_VERSION="1.3.2";FLAC_API_EXPORTS;FLAC__HAS_OGG=0;HAVE_LROUND;HAVE_STDINT_H;HAVE_SYS_PARAM_H;HAVE_FSEEKO;PACKAGE="mednafen";MEDNAFEN_VERSION_NUMERIC=9386;__LIBRETRO__;_LOW_ACCURACY_;_FILE_OFFSET_BITS=64;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__ORDER_LITTLE_ENDIAN__;__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__;HAVE_VULKAN;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
@@ -336,7 +355,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;$(ProjectDir);$(ProjectDir)../parallel-psx/vulkan/SPIRV-Cross;$(ProjectDir)../parallel-psx/renderer;$(ProjectDir)../parallel-psx/khronos/include;$(ProjectDir)../parallel-psx/atlas;$(ProjectDir)../parallel-psx/glsl/prebuilt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;$(ProjectDir);$(ProjectDir)../parallel-psx/SPIRV-Cross;$(ProjectDir)../parallel-psx/renderer;$(ProjectDir)../parallel-psx/util;$(ProjectDir)../parallel-psx/volk;$(ProjectDir)../parallel-psx/khronos/include;$(ProjectDir)../parallel-psx/atlas;$(ProjectDir)../parallel-psx/glsl/prebuilt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_OPENGL;CORE;HAVE_HW;HAVE_PBP;HAVE_THREADS;NEED_DEINTERLACER;WANT_32BPP;NEED_CD;HAVE_CHD;_7ZIP_ST;PACKAGE_VERSION="1.3.2";FLAC_API_EXPORTS;FLAC__HAS_OGG=0;HAVE_LROUND;HAVE_STDINT_H;HAVE_SYS_PARAM_H;HAVE_FSEEKO;PACKAGE="mednafen";MEDNAFEN_VERSION_NUMERIC=9386;__LIBRETRO__;_LOW_ACCURACY_;_FILE_OFFSET_BITS=64;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__ORDER_LITTLE_ENDIAN__;__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__;HAVE_VULKAN;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
@@ -355,7 +374,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;$(ProjectDir);$(ProjectDir)../parallel-psx/vulkan/SPIRV-Cross;$(ProjectDir)../parallel-psx/renderer;$(ProjectDir)../parallel-psx/khronos/include;$(ProjectDir)../parallel-psx/atlas;$(ProjectDir)../parallel-psx/glsl/prebuilt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;$(ProjectDir);$(ProjectDir)../parallel-psx/SPIRV-Cross;$(ProjectDir)../parallel-psx/renderer;$(ProjectDir)../parallel-psx/util;$(ProjectDir)../parallel-psx/volk;$(ProjectDir)../parallel-psx/khronos/include;$(ProjectDir)../parallel-psx/atlas;$(ProjectDir)../parallel-psx/glsl/prebuilt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_OPENGL;CORE;HAVE_HW;HAVE_PBP;HAVE_THREADS;NEED_DEINTERLACER;WANT_32BPP;NEED_CD;HAVE_CHD;_7ZIP_ST;PACKAGE_VERSION="1.3.2";FLAC_API_EXPORTS;FLAC__HAS_OGG=0;HAVE_LROUND;HAVE_STDINT_H;HAVE_SYS_PARAM_H;HAVE_FSEEKO;PACKAGE="mednafen";MEDNAFEN_VERSION_NUMERIC=9386;__LIBRETRO__;_LOW_ACCURACY_;_FILE_OFFSET_BITS=64;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__ORDER_LITTLE_ENDIAN__;__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__;HAVE_VULKAN;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
diff --git a/msvc/mednafen_psx_hw_libretro.vcxproj.filters b/msvc/mednafen_psx_hw_libretro.vcxproj.filters
index f9475880..9fe63410 100644
--- a/msvc/mednafen_psx_hw_libretro.vcxproj.filters
+++ b/msvc/mednafen_psx_hw_libretro.vcxproj.filters
@@ -106,9 +106,15 @@
     <Filter Include="parallel-psx\renderer">
       <UniqueIdentifier>{856e1122-cfd8-47d5-a8f0-a22962339f13}</UniqueIdentifier>
     </Filter>
-    <Filter Include="parallel-psx\vulkan\SPIRV-Cross">
+    <Filter Include="parallel-psx\volk">
+      <UniqueIdentifier>{34df19c1-aa3a-420d-bd11-e5b40e22fa6c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="parallel-psx\SPIRV-Cross">
       <UniqueIdentifier>{1206038d-6a45-4f62-97d2-90ed16bcd5f2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="parallel-psx\util">
+      <UniqueIdentifier>{03c57f09-0f49-4391-950f-924f976de6a5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\libretro-common\rthreads\rthreads.c">
@@ -561,9 +567,6 @@
     <ClCompile Include="..\parallel-psx\vulkan\buffer.cpp">
       <Filter>parallel-psx\vulkan</Filter>
     </ClCompile>
-    <ClCompile Include="..\parallel-psx\vulkan\chain_allocator.cpp">
-      <Filter>parallel-psx\vulkan</Filter>
-    </ClCompile>
     <ClCompile Include="..\parallel-psx\vulkan\command_buffer.cpp">
       <Filter>parallel-psx\vulkan</Filter>
     </ClCompile>
@@ -600,9 +603,6 @@
     <ClCompile Include="..\parallel-psx\vulkan\sampler.cpp">
       <Filter>parallel-psx\vulkan</Filter>
     </ClCompile>
-    <ClCompile Include="..\parallel-psx\vulkan\SPIRV-Cross\spirv_cross.cpp">
-      <Filter>parallel-psx\vulkan\SPIRV-Cross</Filter>
-    </ClCompile>
     <ClCompile Include="..\parallel-psx\vulkan\semaphore.cpp">
       <Filter>parallel-psx\vulkan</Filter>
     </ClCompile>
@@ -615,8 +615,56 @@
     <ClCompile Include="..\parallel-psx\vulkan\vulkan.cpp">
       <Filter>parallel-psx\vulkan</Filter>
     </ClCompile>
-    <ClCompile Include="..\parallel-psx\vulkan\vulkan_symbol_wrapper.cpp">
+    <ClCompile Include="..\parallel-psx\SPIRV-Cross\spirv_cfg.cpp">
+      <Filter>parallel-psx\SPIRV-Cross</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\SPIRV-Cross\spirv_cross.cpp">
+      <Filter>parallel-psx\SPIRV-Cross</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\SPIRV-Cross\spirv_cross_parsed_ir.cpp">
+      <Filter>parallel-psx\SPIRV-Cross</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\SPIRV-Cross\spirv_parser.cpp">
+      <Filter>parallel-psx\SPIRV-Cross</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\volk\volk.c">
+      <Filter>parallel-psx\volk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\vulkan\wsi_timing.cpp">
       <Filter>parallel-psx\vulkan</Filter>
     </ClCompile>
+    <ClCompile Include="..\parallel-psx\vulkan\buffer_pool.cpp">
+      <Filter>parallel-psx\vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\vulkan\event_manager.cpp">
+      <Filter>parallel-psx\vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\vulkan\fence.cpp">
+      <Filter>parallel-psx\vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\vulkan\pipeline_event.cpp">
+      <Filter>parallel-psx\vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\vulkan\query_pool.cpp">
+      <Filter>parallel-psx\vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\vulkan\texture_format.cpp">
+      <Filter>parallel-psx\vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\vulkan\wsi.cpp">
+      <Filter>parallel-psx\vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\util\cli_parser.cpp">
+      <Filter>parallel-psx\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\util\timer.cpp">
+      <Filter>parallel-psx\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\util\dynamic_library.cpp">
+      <Filter>parallel-psx\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parallel-psx\util\util.cpp">
+      <Filter>parallel-psx\util</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/mednafen_psx_libretro.vcxproj b/msvc/mednafen_psx_libretro.vcxproj
index c43397fb..0a3026d6 100644
--- a/msvc/mednafen_psx_libretro.vcxproj
+++ b/msvc/mednafen_psx_libretro.vcxproj
@@ -97,6 +97,7 @@
     <ClCompile Include="..\deps\lzma-16.04\C\LzmaEnc.c" />
     <ClCompile Include="..\deps\lzma-16.04\C\LzmaLib.c" />
     <ClCompile Include="..\deps\lzma-16.04\C\Sort.c" />
+    <ClCompile Include="..\deps\ugui\ugui.c" />
     <ClCompile Include="..\deps\zlib\adler32.c" />
     <ClCompile Include="..\deps\zlib\compress.c" />
     <ClCompile Include="..\deps\zlib\crc32.c" />
@@ -205,6 +206,7 @@
     <ClCompile Include="..\pgxp\pgxp_value.c" />
     <ClCompile Include="..\rsx\rsx_intf.cpp" />
     <ClCompile Include="..\rsx\rsx_lib_soft.c" />
+    <ClCompile Include="..\ugui_tools.c" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
@@ -279,7 +281,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/ugui;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE__MKDIR;HAVE_PBP;WANT_THREADING;HAVE_THREADS;NEED_DEINTERLACER;ARCH_X86;WANT_32BPP;WANT_NEW_API;FRONTEND_SUPPORTS_RGB565;NEED_CD;HAVE_CHD;_7ZIP_ST;PACKAGE_VERSION="1.3.2";FLAC_API_EXPORTS;FLAC__HAS_OGG=0;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;HAVE_SYS_PARAM_H;HAVE_FSEEKO;NEED_TREMOR;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION="0.9.38.6";PACKAGE="mednafen";MEDNAFEN_VERSION_NUMERIC=9386;PSS_STYLE=1;MPC_FIXED_POINT;WANT_PSX_EMU;STDC_HEADERS;__STDC_LIMIT_MACROS;__LIBRETRO__;_LOW_ACCURACY_;_FILE_OFFSET_BITS=64;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__ORDER_LITTLE_ENDIAN__;__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -290,7 +292,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/ugui;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE__MKDIR;HAVE_PBP;WANT_THREADING;HAVE_THREADS;NEED_DEINTERLACER;ARCH_X86;WANT_32BPP;WANT_NEW_API;FRONTEND_SUPPORTS_RGB565;NEED_CD;HAVE_CHD;_7ZIP_ST;PACKAGE_VERSION="1.3.2";FLAC_API_EXPORTS;FLAC__HAS_OGG=0;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;HAVE_SYS_PARAM_H;HAVE_FSEEKO;NEED_TREMOR;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION="0.9.38.6";PACKAGE="mednafen";MEDNAFEN_VERSION_NUMERIC=9386;PSS_STYLE=1;MPC_FIXED_POINT;WANT_PSX_EMU;STDC_HEADERS;__STDC_LIMIT_MACROS;__LIBRETRO__;_LOW_ACCURACY_;_FILE_OFFSET_BITS=64;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__ORDER_LITTLE_ENDIAN__;__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -303,7 +305,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/ugui;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE__MKDIR;HAVE_PBP;WANT_THREADING;HAVE_THREADS;NEED_DEINTERLACER;ARCH_X86;WANT_32BPP;WANT_NEW_API;FRONTEND_SUPPORTS_RGB565;NEED_CD;HAVE_CHD;_7ZIP_ST;PACKAGE_VERSION="1.3.2";FLAC_API_EXPORTS;FLAC__HAS_OGG=0;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;HAVE_SYS_PARAM_H;HAVE_FSEEKO;NEED_TREMOR;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION="0.9.38.6";PACKAGE="mednafen";MEDNAFEN_VERSION_NUMERIC=9386;PSS_STYLE=1;MPC_FIXED_POINT;WANT_PSX_EMU;STDC_HEADERS;__STDC_LIMIT_MACROS;__LIBRETRO__;_LOW_ACCURACY_;_FILE_OFFSET_BITS=64;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__ORDER_LITTLE_ENDIAN__;__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -320,7 +322,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../mednafen;$(ProjectDir)../mednafen/include;$(ProjectDir)../mednafen/intl;$(ProjectDir)../mednafen/hw_sound;$(ProjectDir)../mednafen/hw_cpu;$(ProjectDir)../mednafen/hw_misc;$(ProjectDir)../libretro-common/include;$(ProjectDir)../deps/zlib;$(ProjectDir)../deps/ugui;$(ProjectDir)../deps/crypto;$(ProjectDir)../deps/flac-1.3.2/include;$(ProjectDir)../deps/flac-1.3.2/src/libFLAC/include;$(ProjectDir)../deps/lzma-16.04/C;$(ProjectDir)../deps/libchdr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE__MKDIR;HAVE_PBP;WANT_THREADING;HAVE_THREADS;NEED_DEINTERLACER;ARCH_X86;WANT_32BPP;WANT_NEW_API;FRONTEND_SUPPORTS_RGB565;NEED_CD;HAVE_CHD;_7ZIP_ST;PACKAGE_VERSION="1.3.2";FLAC_API_EXPORTS;FLAC__HAS_OGG=0;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;HAVE_SYS_PARAM_H;HAVE_FSEEKO;NEED_TREMOR;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION="0.9.38.6";PACKAGE="mednafen";MEDNAFEN_VERSION_NUMERIC=9386;PSS_STYLE=1;MPC_FIXED_POINT;WANT_PSX_EMU;STDC_HEADERS;__STDC_LIMIT_MACROS;__LIBRETRO__;_LOW_ACCURACY_;_FILE_OFFSET_BITS=64;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__ORDER_LITTLE_ENDIAN__;__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
diff --git a/msvc/mednafen_psx_libretro.vcxproj.filters b/msvc/mednafen_psx_libretro.vcxproj.filters
index 337908a5..b47306d1 100644
--- a/msvc/mednafen_psx_libretro.vcxproj.filters
+++ b/msvc/mednafen_psx_libretro.vcxproj.filters
@@ -70,6 +70,9 @@
     <Filter Include="libretro-common\vfs">
       <UniqueIdentifier>{b2c8ed6d-a8b0-4db4-98bc-bb9dc77672f2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="deps\ugui">
+      <UniqueIdentifier>{3ed17401-65a1-4526-b353-862683e6e283}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\libretro-common\rthreads\rthreads.c">
@@ -504,5 +507,9 @@
     <ClCompile Include="..\mednafen\mednafen-endian.cpp">
       <Filter>mednafen</Filter>
     </ClCompile>
+    <ClCompile Include="..\ugui_tools.c" />
+    <ClCompile Include="..\deps\ugui\ugui.c">
+      <Filter>deps\ugui</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file