Merge pull request #4260 from Themaister/master

Vulkan: Fix VSync toggling on Windows.
This commit is contained in:
Twinaphex 2016-12-17 12:23:15 +01:00 committed by GitHub
commit accf137020
2 changed files with 4 additions and 1 deletions

View File

@ -1457,6 +1457,8 @@ static bool vulkan_context_init_device(gfx_ctx_vulkan_data_t *vk)
vkGetPhysicalDeviceMemoryProperties(vk->context.gpu,
&vk->context.memory_properties);
RARCH_LOG("[Vulkan]: Using GPU: %s\n", vk->context.gpu_properties.deviceName);
if (vk->context.device == VK_NULL_HANDLE)
{
VkQueueFamilyProperties *queue_properties = NULL;

View File

@ -276,12 +276,12 @@ void *dinput_wgl;
static void gfx_ctx_wgl_swap_interval(void *data, unsigned interval)
{
(void)data;
win32_interval = interval;
switch (win32_api)
{
case GFX_CTX_OPENGL_API:
#ifdef HAVE_OPENGL
win32_interval = interval;
if (!win32_hrc)
return;
if (!p_swap_interval)
@ -306,6 +306,7 @@ static void gfx_ctx_wgl_swap_interval(void *data, unsigned interval)
case GFX_CTX_NONE:
default:
win32_interval = interval;
break;
}
}