Merge branch 'master' into d3d12

2018-11-24 16:26:27 +03:00
parent ff363d85be 24dd0267bf
commit 5c1efe7b9a
48 changed files with 10195 additions and 5730 deletions
--- a/src/xenia/gpu/vulkan/premake5.lua
+++ b/src/xenia/gpu/vulkan/premake5.lua
@@ -38,6 +38,7 @@ project("xenia-gpu-vulkan-trace-viewer")
    "imgui",
    "libavcodec",
    "libavutil",
+    "mspack",
    "snappy",
    "spirv-tools",
    "volk",
@@ -110,6 +111,7 @@ project("xenia-gpu-vulkan-trace-dump")
    "imgui",
    "libavcodec",
    "libavutil",
+    "mspack",
    "snappy",
    "spirv-tools",
    "volk",