Skip to content

Commit b3f5ed5

Browse files
committed
Set vulkan to default renderer whenever we have vulkan support
1 parent fa5a16e commit b3f5ed5

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

rpcs3/Emu/system_config.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,11 @@ struct cfg_root : cfg::node
119119
{
120120
node_video(cfg::node* _this) : cfg::node(_this, "Video") {}
121121

122-
cfg::_enum<video_renderer> renderer{ this, "Renderer",
123-
#if defined(ANDROID) || defined(__APPLE__)
124-
video_renderer::vulkan
122+
#if defined(HAVE_VULKAN)
123+
cfg::_enum<video_renderer> renderer{ this, "Renderer", video_renderer::vulkan };
125124
#else
126-
video_renderer::opengl // TODO: Is it still actual?
125+
cfg::_enum<video_renderer> renderer{ this, "Renderer", video_renderer::opengl };
127126
#endif
128-
};
129127

130128
cfg::_enum<video_resolution> resolution{ this, "Resolution", video_resolution::_720p };
131129
cfg::_enum<video_aspect> aspect_ratio{ this, "Aspect ratio", video_aspect::_16_9 };

rpcs3/Input/hid_pad_handler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ void hid_pad_handler<Device>::update_devices()
310310
#ifdef ANDROID
311311
if (hid_device* dev = hid_libusb_wrap_sys_device(path, -1))
312312
#else
313-
if (hid_device* dev = hid_open_path(path))
313+
if (hid_device* dev = hid_open_path(path.c_str()))
314314
#endif
315315
{
316316
if (const hid_device_info* info = hid_get_device_info(dev))

0 commit comments

Comments
 (0)