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

Cleanups

This commit is contained in:
twinaphex 2020-02-14 12:55:36 +01:00
parent de604a79ab
commit cb0c145e3d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/common/drm_common.c
View File

@ -27,7 +27,7 @@ uint32_t g_connector_id = 0;
int g_drm_fd = 0; int g_drm_fd = 0;
uint32_t g_crtc_id = 0; uint32_t g_crtc_id = 0;
drmModeCrtc *g_orig_crtc = NULL; drmModeCrtc *g_orig_crtc = NULL;
static drmModeRes *g_drm_resources = NULL; static drmModeRes *g_drm_resources = NULL;
drmModeConnector *g_drm_connector = NULL; drmModeConnector *g_drm_connector = NULL;

9
gfx/common/vulkan_common.c
View File

@ -1584,6 +1584,7 @@ static bool vulkan_context_init_gpu(gfx_ctx_vulkan_data_t *vk)
VkPhysicalDevice *gpus = NULL; VkPhysicalDevice *gpus = NULL;
union string_list_elem_attr attr = {0}; union string_list_elem_attr attr = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
int gpu_index = settings->ints.vulkan_gpu_index;
if (vkEnumeratePhysicalDevices(vk->context.instance, if (vkEnumeratePhysicalDevices(vk->context.instance,
&gpu_count, NULL) != VK_SUCCESS) &gpu_count, NULL) != VK_SUCCESS)
@ -1633,14 +1634,14 @@ static bool vulkan_context_init_gpu(gfx_ctx_vulkan_data_t *vk)
video_driver_set_gpu_api_devices(GFX_CTX_VULKAN_API, vulkan_gpu_list); video_driver_set_gpu_api_devices(GFX_CTX_VULKAN_API, vulkan_gpu_list);
if (0 <= settings->ints.vulkan_gpu_index && settings->ints.vulkan_gpu_index < (int)gpu_count) if (0 <= gpu_index && gpu_index < (int)gpu_count)
{ {
RARCH_LOG("[Vulkan]: Using GPU index %d.\n", settings->ints.vulkan_gpu_index); RARCH_LOG("[Vulkan]: Using GPU index %d.\n", gpu_index);
vk->context.gpu = gpus[settings->ints.vulkan_gpu_index]; vk->context.gpu = gpus[gpu_index];
} }
else else
{ {
RARCH_WARN("[Vulkan]: Invalid GPU index %d, using first device found.\n", settings->ints.vulkan_gpu_index); RARCH_WARN("[Vulkan]: Invalid GPU index %d, using first device found.\n", gpu_index);
vk->context.gpu = gpus[0]; vk->context.gpu = gpus[0];
} }