Merge branch 'master' into d3d12

2019-04-19 15:32:10 +03:00
parent c006acf2c2 18d8a59cfa
commit 40ffba97d9
12 changed files with 176 additions and 72 deletions
--- a/src/xenia/gpu/premake5.lua
+++ b/src/xenia/gpu/premake5.lua
@@ -48,8 +48,12 @@ project("xenia-gpu-shader-compiler")
  files({
    "shader_compiler_main.cc",
    "../base/main_"..platform_suffix..".cc",
+    "../base/main_entrypoint_"..platform_suffix..".cc",
  })

+  filter("files:../base/main_entrypoint_"..platform_suffix..".cc")
+    vectorextensions("IA32")  -- Disable AVX so our AVX check/error can happen.
+
  filter("platforms:Windows")
    -- Only create the .user file if it doesn't already exist.
    local user_file = project_root.."/build/xenia-gpu-shader-compiler.vcxproj.user"