diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index 2e0849e3c3..f68d9d0d28 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -119,13 +119,11 @@ struct cfg_root : cfg::node { node_video(cfg::node* _this) : cfg::node(_this, "Video") {} - cfg::_enum renderer{ this, "Renderer", -#if defined(ANDROID) || defined(__APPLE__) - video_renderer::vulkan +#if defined(HAVE_VULKAN) + cfg::_enum renderer{ this, "Renderer", video_renderer::vulkan }; #else - video_renderer::opengl // TODO: Is it still actual? + cfg::_enum renderer{ this, "Renderer", video_renderer::opengl }; #endif - }; cfg::_enum resolution{ this, "Resolution", video_resolution::_720p }; cfg::_enum aspect_ratio{ this, "Aspect ratio", video_aspect::_16_9 }; diff --git a/rpcs3/Input/hid_pad_handler.cpp b/rpcs3/Input/hid_pad_handler.cpp index 90cb5fb55d..291728fbc1 100644 --- a/rpcs3/Input/hid_pad_handler.cpp +++ b/rpcs3/Input/hid_pad_handler.cpp @@ -310,7 +310,7 @@ void hid_pad_handler::update_devices() #ifdef ANDROID if (hid_device* dev = hid_libusb_wrap_sys_device(path, -1)) #else - if (hid_device* dev = hid_open_path(path)) + if (hid_device* dev = hid_open_path(path.c_str())) #endif { if (const hid_device_info* info = hid_get_device_info(dev))