Merge branch 'vulkan' of github.com:benvanik/xenia into vulkan

Srivats728 · Feb 21, 2016 · 6d65439 · 6d65439
2 parents cd02cdf + 5033480
commit 6d65439
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua
@@ -19,6 +19,7 @@ project("xenia-app")
     "xenia-debug-ui",
     "xenia-gpu",
     "xenia-gpu-gl4",
+    "xenia-gpu-vulkan",
     "xenia-hid-nop",
     "xenia-kernel",
     "xenia-ui",

diff --git a/src/xenia/app/xenia_main.cc b/src/xenia/app/xenia_main.cc
@@ -25,6 +25,7 @@
 
 // Available graphics systems:
 #include "xenia/gpu/gl4/gl4_graphics_system.h"
+#include "xenia/gpu/vulkan/vulkan_graphics_system.h"
 
 // Available input drivers:
 #include "xenia/hid/nop/nop_hid.h"
@@ -69,6 +70,9 @@ std::unique_ptr<gpu::GraphicsSystem> CreateGraphicsSystem() {
   if (FLAGS_gpu.compare("gl4") == 0) {
     return std::unique_ptr<gpu::GraphicsSystem>(
         new xe::gpu::gl4::GL4GraphicsSystem());
+  } else if (FLAGS_gpu.compare("vulkan") == 0) {
+    return std::unique_ptr<gpu::GraphicsSystem>(
+        new xe::gpu::vulkan::VulkanGraphicsSystem());
   } else {
     // Create best available.
     std::unique_ptr<gpu::GraphicsSystem> best;