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

[App] Remove unnecessary type aliasing (which also broke Travis).

This commit is contained in:
gibbed 2019-08-03 18:10:49 -05:00
parent f5cddbbf3f
commit e5eb59df71
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,40 +141,27 @@ class Factory {
}; };
std::unique_ptr<apu::AudioSystem> CreateAudioSystem(cpu::Processor* processor) { std::unique_ptr<apu::AudioSystem> CreateAudioSystem(cpu::Processor* processor) {
using NopAS = apu::nop::NopAudioSystem; Factory<apu::AudioSystem, cpu::Processor*> factory;
using XAudio2AS = apu::xaudio2::XAudio2AudioSystem;
using Factory = Factory<apu::AudioSystem, cpu::Processor*>;
Factory factory;
#if XE_PLATFORM_WIN32 #if XE_PLATFORM_WIN32
factory.Add<XAudio2AS>("xaudio2"); factory.Add<apu::xaudio2::XAudio2AudioSystem>("xaudio2");
#endif // XE_PLATFORM_WIN32 #endif // XE_PLATFORM_WIN32
factory.Add<NopAS>("nop"); factory.Add<apu::nop::NopAudioSystem>("nop");
return factory.Create(cvars::apu, processor); return factory.Create(cvars::apu, processor);
} }
std::unique_ptr<gpu::GraphicsSystem> CreateGraphicsSystem() { std::unique_ptr<gpu::GraphicsSystem> CreateGraphicsSystem() {
using NullGS = gpu::null::NullGraphicsSystem; Factory<gpu::GraphicsSystem> factory;
using D3D12GS = gpu::d3d12::D3D12GraphicsSystem;
using VulkanGS = gpu::vulkan::VulkanGraphicsSystem;
using Factory = Factory<gpu::GraphicsSystem>;
Factory factory;
#if XE_PLATFORM_WIN32 #if XE_PLATFORM_WIN32
factory.Add<D3D12GS>("d3d12"); factory.Add<gpu::d3d12::D3D12GraphicsSystem>("d3d12");
#endif // XE_PLATFORM_WIN32 #endif // XE_PLATFORM_WIN32
factory.Add<VulkanGS>("vulkan"); factory.Add<gpu::vulkan::VulkanGraphicsSystem>("vulkan");
factory.Add<NullGS>("null"); factory.Add<gpu::null::NullGraphicsSystem>("null");
return factory.Create(cvars::gpu); return factory.Create(cvars::gpu);
} }
std::vector<std::unique_ptr<hid::InputDriver>> CreateInputDrivers( std::vector<std::unique_ptr<hid::InputDriver>> CreateInputDrivers(
ui::Window* window) { ui::Window* window) {
using Factory = Factory<hid::InputDriver, ui::Window*>; Factory<hid::InputDriver, ui::Window*> factory;
Factory factory;
#if XE_PLATFORM_WIN32 #if XE_PLATFORM_WIN32
factory.Add("winkey", xe::hid::winkey::Create); factory.Add("winkey", xe::hid::winkey::Create);
factory.Add("xinput", xe::hid::xinput::Create); factory.Add("xinput", xe::hid::xinput::Create);