Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental

src/xenia/gpu/vulkan/premake5.lua

@@ -8,10 +8,10 @@ project("xenia-gpu-vulkan")
   language("C++")
   links({
     "fmt",
+    "glslang-spirv",
     "xenia-base",
     "xenia-gpu",
     "xenia-ui",
-    "xenia-ui-spirv",
     "xenia-ui-vulkan",
     "xxhash",
   })
@@ -20,10 +20,9 @@ project("xenia-gpu-vulkan")
   })
   local_platform_files()
   files({
-    "shaders/bytecode/vulkan_spirv/*.h",
+    "../shaders/bytecode/vulkan_spirv/*.h",
   })
 
--- TODO(benvanik): kill this and move to the debugger UI.
 group("src")
 project("xenia-gpu-vulkan-trace-viewer")
   uuid("86a1dddc-a26a-4885-8c55-cf745225d93e")
@@ -43,7 +42,6 @@ project("xenia-gpu-vulkan-trace-viewer")
     "xenia-kernel",
     "xenia-patcher",
     "xenia-ui",
-    "xenia-ui-spirv",
     "xenia-ui-vulkan",
     "xenia-vfs",
     "xenia-patcher",
@@ -58,7 +56,6 @@ project("xenia-gpu-vulkan-trace-viewer")
     "libavutil",
     "mspack",
     "snappy",
-    "spirv-tools",
     "xxhash",
   })
   includedirs({
@@ -77,12 +74,6 @@ project("xenia-gpu-vulkan-trace-viewer")
     })
 
   filter("platforms:Windows")
-    links({
-      "xenia-apu-xaudio2",
-      "xenia-hid-winkey",
-      "xenia-hid-xinput",
-    })
-
     -- Only create the .user file if it doesn't already exist.
     local user_file = project_root.."/build/xenia-gpu-vulkan-trace-viewer.vcxproj.user"
     if not os.isfile(user_file) then
@@ -111,7 +102,6 @@ project("xenia-gpu-vulkan-trace-dump")
     "xenia-hid-nop",
     "xenia-kernel",
     "xenia-ui",
-    "xenia-ui-spirv",
     "xenia-ui-vulkan",
     "xenia-vfs",
     "xenia-patcher",
@@ -126,7 +116,6 @@ project("xenia-gpu-vulkan-trace-dump")
     "libavutil",
     "mspack",
     "snappy",
-    "spirv-tools",
     "xxhash",
   })
   includedirs({