mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2740 from Themaister/master

Browse Source 
Vulkan: Small tweaks
This commit is contained in:
Twinaphex 2016-02-20 15:30:17 +01:00
commit f41ee75a82
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/common/vulkan_common.c
View File

@ -191,12 +191,9 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
} }
else else
{ {
VkMemoryPropertyFlags cached = type == VULKAN_TEXTURE_READBACK ?
VK_MEMORY_PROPERTY_HOST_CACHED_BIT : 0;
alloc.memoryTypeIndex = vulkan_find_memory_type_fallback(&vk->context->memory_properties, alloc.memoryTypeIndex = vulkan_find_memory_type_fallback(&vk->context->memory_properties,
mem_reqs.memoryTypeBits, mem_reqs.memoryTypeBits,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | cached, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT); VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
} }
@ -915,7 +912,8 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk,
for (i = 0; i < queue_count; i++) for (i = 0; i < queue_count; i++)
{ {
if (queue_properties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) VkQueueFlags required = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT;
if ((queue_properties[i].queueFlags & required) == required)
{ {
vk->context.graphics_queue_index = i; vk->context.graphics_queue_index = i;
RARCH_LOG("[Vulkan]: Device supports %u sub-queues.\n", RARCH_LOG("[Vulkan]: Device supports %u sub-queues.\n",
@ -1312,6 +1310,11 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
swapchain_size = surface_properties.currentExtent; swapchain_size = surface_properties.currentExtent;
desired_swapchain_images = surface_properties.minImageCount + 1; desired_swapchain_images = surface_properties.minImageCount + 1;
/* Limit latency. */
if (desired_swapchain_images > 3)
desired_swapchain_images = 3;
if ((surface_properties.maxImageCount > 0) if ((surface_properties.maxImageCount > 0)
&& (desired_swapchain_images > surface_properties.maxImageCount)) && (desired_swapchain_images > surface_properties.maxImageCount))
desired_swapchain_images = surface_properties.maxImageCount; desired_swapchain_images = surface_properties.maxImageCount;
@ -1380,6 +1383,8 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
vk->fpGetSwapchainImagesKHR(vk->context.device, vk->swapchain, vk->fpGetSwapchainImagesKHR(vk->context.device, vk->swapchain,
&vk->context.num_swapchain_images, vk->context.swapchain_images); &vk->context.num_swapchain_images, vk->context.swapchain_images);
RARCH_LOG("[Vulkan]: Got %u swapchain images.\n", vk->context.num_swapchain_images);
for (i = 0; i < vk->context.num_swapchain_images; i++) for (i = 0; i < vk->context.num_swapchain_images; i++)
{ {
if (vk->context.swapchain_fences[i]) if (vk->context.swapchain_fences[i])