ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Ben Vanik 2016-02-20 19:19:41 -08:00
parent cd02cdfc70 5033480bec
commit 6d65439efe
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/xenia/app/premake5.lua
View File

@ -19,6 +19,7 @@ project("xenia-app")
"xenia-debug-ui", "xenia-debug-ui",
"xenia-gpu", "xenia-gpu",
"xenia-gpu-gl4", "xenia-gpu-gl4",
"xenia-gpu-vulkan",
"xenia-hid-nop", "xenia-hid-nop",
"xenia-kernel", "xenia-kernel",
"xenia-ui", "xenia-ui",

4
src/xenia/app/xenia_main.cc
View File

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