archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1585 from MyaniPT/patch-2

Browse source 
Fixes #1584 (Vulkan not being usable in non-w10 systems)
This commit is contained in:
vlj 2016-03-17 14:39:54 +01:00
commit cd5edc38ff
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rpcs3/Gui/SettingsDialog.cpp
View file

@ -229,6 +229,7 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg)
cbox_gs_render->Append("Null"); cbox_gs_render->Append("Null");
cbox_gs_render->Append("OpenGL"); cbox_gs_render->Append("OpenGL");
cbox_gs_render->Append("Vulkan");
#ifdef _MSC_VER #ifdef _MSC_VER
Microsoft::WRL::ComPtr<IDXGIFactory4> dxgiFactory; Microsoft::WRL::ComPtr<IDXGIFactory4> dxgiFactory;
@ -251,7 +252,6 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg)
chbox_gs_overlay->Enable(false); chbox_gs_overlay->Enable(false);
} }
cbox_gs_render->Append("Vulkan");
#endif #endif
for (int i = 1; i < WXSIZEOF(ResolutionTable); ++i) for (int i = 1; i < WXSIZEOF(ResolutionTable); ++i)
@ -503,7 +503,16 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg)
cfg->core.hook_st_func = chbox_core_hook_stfunc->GetValue(); cfg->core.hook_st_func = chbox_core_hook_stfunc->GetValue();
cfg->core.load_liblv2 = chbox_core_load_liblv2->GetValue(); cfg->core.load_liblv2 = chbox_core_load_liblv2->GetValue();
cfg->rsx.renderer = cbox_gs_render->GetSelection(); // Translates renderer string to enum class for config.h
if (cbox_gs_render->GetString(cbox_gs_render->GetSelection()) == "Null")
cfg->rsx.renderer = rsx_renderer_type::Null;
if (cbox_gs_render->GetString(cbox_gs_render->GetSelection()) == "OpenGL")
cfg->rsx.renderer = rsx_renderer_type::OpenGL;
if (cbox_gs_render->GetString(cbox_gs_render->GetSelection()) == "Vulkan")
cfg->rsx.renderer = rsx_renderer_type::Vulkan;
if (cbox_gs_render->GetString(cbox_gs_render->GetSelection()) == "DirectX 12")
cfg->rsx.renderer = rsx_renderer_type::DX12;
cfg->rsx.d3d12.adaptater = cbox_gs_d3d_adaptater->GetSelection(); cfg->rsx.d3d12.adaptater = cbox_gs_d3d_adaptater->GetSelection();
cfg->rsx.resolution = ResolutionNumToId(cbox_gs_resolution->GetSelection() + 1); cfg->rsx.resolution = ResolutionNumToId(cbox_gs_resolution->GetSelection() + 1);
cfg->rsx.aspect_ratio = cbox_gs_aspect->GetSelection() + 1; cfg->rsx.aspect_ratio = cbox_gs_aspect->GetSelection() + 1;

12
rpcs3/config.h
View file

@ -50,8 +50,8 @@ enum class rsx_renderer_type
{ {
Null, Null,
OpenGL, OpenGL,
DX12, Vulkan,
Vulkan DX12
}; };
enum class rsx_aspect_ratio enum class rsx_aspect_ratio
@ -93,8 +93,8 @@ namespace convert
{ {
case rsx_renderer_type::Null: return "Null"; case rsx_renderer_type::Null: return "Null";
case rsx_renderer_type::OpenGL: return "OpenGL"; case rsx_renderer_type::OpenGL: return "OpenGL";
case rsx_renderer_type::DX12: return "DX12";
case rsx_renderer_type::Vulkan: return "Vulkan"; case rsx_renderer_type::Vulkan: return "Vulkan";
case rsx_renderer_type::DX12: return "DX12";
} }
return "Unknown"; return "Unknown";
@ -112,12 +112,12 @@ namespace convert
if (value == "OpenGL") if (value == "OpenGL")
return rsx_renderer_type::OpenGL; return rsx_renderer_type::OpenGL;
if (value == "DX12")
return rsx_renderer_type::DX12;
if (value == "Vulkan") if (value == "Vulkan")
return rsx_renderer_type::Vulkan; return rsx_renderer_type::Vulkan;
if (value == "DX12")
return rsx_renderer_type::DX12;
return rsx_renderer_type::Null; return rsx_renderer_type::Null;
} }
}; };