mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 12:32:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

vulkan: remove uneeded buffer inheritence information

Browse source 
buffer inheritence informationi is only required for secondary command
buffers which we are not creating
This commit is contained in:
Matthew Waters 2019-05-16 22:39:51 +10:00
parent 9593e4e8bb
commit 1230a6c723
2 changed files with 8 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ext/vulkan/vkswapper.c
View file

@ -524,26 +524,12 @@ _swapper_set_image_layout (GstVulkanSwapper * swapper,
goto error; goto error;
{ {
VkCommandBufferInheritanceInfo buf_inh = { 0, };
VkCommandBufferBeginInfo cmd_buf_info = { 0, };
/* *INDENT-OFF* */ /* *INDENT-OFF* */
buf_inh = (VkCommandBufferInheritanceInfo) { VkCommandBufferBeginInfo cmd_buf_info = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO,
.pNext = NULL,
.renderPass = VK_NULL_HANDLE,
.subpass = 0,
.framebuffer = VK_NULL_HANDLE,
.occlusionQueryEnable = FALSE,
.queryFlags = 0,
.pipelineStatistics = 0
};
cmd_buf_info = (VkCommandBufferBeginInfo) {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.pNext = NULL, .pNext = NULL,
.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
.pInheritanceInfo = &buf_inh .pInheritanceInfo = NULL
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */
@ -834,26 +820,12 @@ _build_render_buffer_cmd (GstVulkanSwapper * swapper, guint32 swap_idx,
return FALSE; return FALSE;
{ {
VkCommandBufferInheritanceInfo buf_inh = { 0, };
VkCommandBufferBeginInfo cmd_buf_info = { 0, };
/* *INDENT-OFF* */ /* *INDENT-OFF* */
buf_inh = (VkCommandBufferInheritanceInfo) { VkCommandBufferBeginInfo cmd_buf_info = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO,
.pNext = NULL,
.renderPass = VK_NULL_HANDLE,
.subpass = 0,
.framebuffer = VK_NULL_HANDLE,
.occlusionQueryEnable = FALSE,
.queryFlags = 0,
.pipelineStatistics = 0
};
cmd_buf_info = (VkCommandBufferBeginInfo) {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.pNext = NULL, .pNext = NULL,
.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
.pInheritanceInfo = &buf_inh .pInheritanceInfo = NULL
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */

36
ext/vulkan/vkupload.c
View file

@ -476,26 +476,12 @@ _buffer_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
goto out; goto out;
{ {
VkCommandBufferInheritanceInfo buf_inh = { 0, };
VkCommandBufferBeginInfo cmd_buf_info = { 0, };
/* *INDENT-OFF* */ /* *INDENT-OFF* */
buf_inh = (VkCommandBufferInheritanceInfo) { VkCommandBufferBeginInfo cmd_buf_info = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO,
.pNext = NULL,
.renderPass = VK_NULL_HANDLE,
.subpass = 0,
.framebuffer = VK_NULL_HANDLE,
.occlusionQueryEnable = FALSE,
.queryFlags = 0,
.pipelineStatistics = 0
};
cmd_buf_info = (VkCommandBufferBeginInfo) {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.pNext = NULL, .pNext = NULL,
.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
.pInheritanceInfo = &buf_inh .pInheritanceInfo = NULL
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */
@ -762,26 +748,12 @@ _raw_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
goto out; goto out;
{ {
VkCommandBufferInheritanceInfo buf_inh = { 0, };
VkCommandBufferBeginInfo cmd_buf_info = { 0, };
/* *INDENT-OFF* */ /* *INDENT-OFF* */
buf_inh = (VkCommandBufferInheritanceInfo) { VkCommandBufferBeginInfo cmd_buf_info = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO,
.pNext = NULL,
.renderPass = VK_NULL_HANDLE,
.subpass = 0,
.framebuffer = VK_NULL_HANDLE,
.occlusionQueryEnable = FALSE,
.queryFlags = 0,
.pipelineStatistics = 0
};
cmd_buf_info = (VkCommandBufferBeginInfo) {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.pNext = NULL, .pNext = NULL,
.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
.pInheritanceInfo = &buf_inh .pInheritanceInfo = NULL
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */