Merge remote-tracking branch 'origin/master' into d3d12

2019-04-20 02:40:46 -05:00
parent 40ffba97d9 4f44bc3362
commit c965751911
12 changed files with 108 additions and 153 deletions
--- a/src/xenia/gpu/premake5.lua
+++ b/src/xenia/gpu/premake5.lua
@@ -48,12 +48,8 @@ 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"