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

Merge pull request #2738 from Themaister/master 

Try to use cached memory for readbacks.
This commit is contained in:
Twinaphex 2016-02-20 12:07:41 +01:00
parent 452898c0f8 5542427246
commit 720a519987
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gfx/common/vulkan_common.c
View File

@ -62,17 +62,23 @@ uint32_t vulkan_find_memory_type(const VkPhysicalDeviceMemoryProperties *mem_pro
} }
uint32_t vulkan_find_memory_type_fallback(const VkPhysicalDeviceMemoryProperties *mem_props, uint32_t vulkan_find_memory_type_fallback(const VkPhysicalDeviceMemoryProperties *mem_props,
uint32_t device_reqs, uint32_t host_reqs) uint32_t device_reqs, uint32_t host_reqs_first, uint32_t host_reqs_second)
{ {
uint32_t i; uint32_t i;
for (i = 0; i < VK_MAX_MEMORY_TYPES; i++) for (i = 0; i < VK_MAX_MEMORY_TYPES; i++)
{ {
if ((device_reqs & (1u << i)) && if ((device_reqs & (1u << i)) &&
(mem_props->memoryTypes[i].propertyFlags & host_reqs) == host_reqs) (mem_props->memoryTypes[i].propertyFlags & host_reqs_first) == host_reqs_first)
return i; return i;
} }
return vulkan_find_memory_type(mem_props, device_reqs, 0); if (host_reqs_first == 0)
{
RARCH_ERR("[Vulkan]: Failed to find valid memory type. This should never happen.");
abort();
}
return vulkan_find_memory_type_fallback(mem_props, device_reqs, host_reqs_second, 0);
} }
void vulkan_map_persistent_texture(VkDevice device, struct vk_texture *texture) void vulkan_map_persistent_texture(VkDevice device, struct vk_texture *texture)
@ -181,13 +187,16 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
{ {
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_DEVICE_LOCAL_BIT); VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0);
} }
else else
{ {
/* This must exist. */ VkMemoryPropertyFlags cached = type == VULKAN_TEXTURE_READBACK ?
alloc.memoryTypeIndex = vulkan_find_memory_type(&vk->context->memory_properties, VK_MEMORY_PROPERTY_HOST_CACHED_BIT : 0;
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_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
} }

3
gfx/common/vulkan_common.h
View File

@ -404,7 +404,8 @@ uint32_t vulkan_find_memory_type(
uint32_t vulkan_find_memory_type_fallback( uint32_t vulkan_find_memory_type_fallback(
const VkPhysicalDeviceMemoryProperties *mem_props, const VkPhysicalDeviceMemoryProperties *mem_props,
uint32_t device_reqs, uint32_t host_reqs); uint32_t device_reqs, uint32_t host_reqs_first,
uint32_t host_reqs_second);
struct vk_texture vulkan_create_texture(vk_t *vk, struct vk_texture vulkan_create_texture(vk_t *vk,

6
gfx/drivers/vulkan.c
View File

@ -1741,6 +1741,10 @@ static bool vulkan_read_viewport(void *data, uint8_t *buffer)
const uint8_t *src; const uint8_t *src;
unsigned x, y; unsigned x, y;
static struct retro_perf_counter stream_readback = {0};
rarch_perf_init(&stream_readback, "stream_readback");
retro_perf_start(&stream_readback);
buffer += 3 * (vk->vp.height - 1) * vk->vp.width; buffer += 3 * (vk->vp.height - 1) * vk->vp.width;
vkMapMemory(vk->context->device, staging->memory, vkMapMemory(vk->context->device, staging->memory,
staging->offset, staging->size, 0, (void**)&src); staging->offset, staging->size, 0, (void**)&src);
@ -1750,6 +1754,8 @@ static bool vulkan_read_viewport(void *data, uint8_t *buffer)
scaler_ctx_scale(&vk->readback.scaler, buffer, src); scaler_ctx_scale(&vk->readback.scaler, buffer, src);
vkUnmapMemory(vk->context->device, staging->memory); vkUnmapMemory(vk->context->device, staging->memory);
retro_perf_stop(&stream_readback);
} }
else else
{ {