mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

vkimagememory: fix the memory barrier access masks

Browse source 
silences the following warnings from the validation layer

AccessMask xxx must have required access bit xxx and may have optional bits 0
when layout is VK_IMAGE_LAYOUT_TRANSFER_{SRC,DST}_OPTIMAL
This commit is contained in:
Matthew Waters 2015-12-30 15:15:40 +11:00
parent 9a0f415e79
commit 873e0d6340
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
ext/vulkan/vkimagememory.c
View file

@ -423,6 +423,27 @@ _vk_image_mem_free (GstAllocator * allocator, GstMemory * memory)
gst_object_unref (mem->device); gst_object_unref (mem->device);
} }
static VkAccessFlags
_access_flags_from_layout (VkImageLayout image_layout)
{
if (image_layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL)
return VK_ACCESS_TRANSFER_WRITE_BIT;
if (image_layout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL)
return VK_ACCESS_TRANSFER_READ_BIT;
if (image_layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL)
return VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
if (image_layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL)
return VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
if (image_layout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
return VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT;
return 0;
}
gboolean gboolean
gst_vulkan_image_memory_set_layout (GstVulkanImageMemory * vk_mem, gst_vulkan_image_memory_set_layout (GstVulkanImageMemory * vk_mem,
VkImageLayout image_layout, VkImageMemoryBarrier * barrier) VkImageLayout image_layout, VkImageMemoryBarrier * barrier)
@ -431,31 +452,14 @@ gst_vulkan_image_memory_set_layout (GstVulkanImageMemory * vk_mem,
barrier->sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier->sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
barrier->pNext = NULL; barrier->pNext = NULL;
barrier->dstAccessMask = 0; barrier->dstAccessMask = _access_flags_from_layout (image_layout);
barrier->srcAccessMask = 0; barrier->srcAccessMask = _access_flags_from_layout (vk_mem->image_layout);
barrier->oldLayout = vk_mem->image_layout; barrier->oldLayout = vk_mem->image_layout;
barrier->newLayout = image_layout; barrier->newLayout = image_layout;
barrier->image = vk_mem->image; barrier->image = vk_mem->image;
GST_VK_IMAGE_SUBRESOURCE_RANGE (barrier->subresourceRange, GST_VK_IMAGE_SUBRESOURCE_RANGE (barrier->subresourceRange,
VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1); VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1);
if (image_layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) {
barrier->dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
}
if (image_layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) {
barrier->dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
}
if (image_layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) {
barrier->dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
}
if (image_layout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) {
barrier->dstAccessMask =
VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT;
}
/* FIXME: what if the barrier is never submitted or is submitted out of order? */ /* FIXME: what if the barrier is never submitted or is submitted out of order? */
vk_mem->image_layout = image_layout; vk_mem->image_layout = image_layout;