fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: use common entrypoints for VK_KHR_create_renderpass2

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9601>
This commit is contained in:
Samuel Pitoiset 2021-03-15 15:42:46 +01:00 • committed by Marge Bot
parent d7c5b7398b
commit 50b5a9a4a0
1 changed files with 11 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/intel/vulkan/genX_cmd_buffer.c
View file

@ -5979,25 +5979,25 @@ cmd_buffer_end_subpass(struct anv_cmd_buffer *cmd_buffer)
cmd_buffer->state.pass->subpass_flushes[subpass_id + 1]; cmd_buffer->state.pass->subpass_flushes[subpass_id + 1];
} }
void genX(CmdBeginRenderPass)( void genX(CmdBeginRenderPass2)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
const VkRenderPassBeginInfo* pRenderPassBegin, const VkRenderPassBeginInfo* pRenderPassBeginInfo,
VkSubpassContents contents) const VkSubpassBeginInfoKHR* pSubpassBeginInfo)
{ {
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
ANV_FROM_HANDLE(anv_render_pass, pass, pRenderPassBegin->renderPass); ANV_FROM_HANDLE(anv_render_pass, pass, pRenderPassBeginInfo->renderPass);
ANV_FROM_HANDLE(anv_framebuffer, framebuffer, pRenderPassBegin->framebuffer); ANV_FROM_HANDLE(anv_framebuffer, framebuffer, pRenderPassBeginInfo->framebuffer);
VkResult result; VkResult result;
cmd_buffer->state.framebuffer = framebuffer; cmd_buffer->state.framebuffer = framebuffer;
cmd_buffer->state.pass = pass; cmd_buffer->state.pass = pass;
cmd_buffer->state.render_area = pRenderPassBegin->renderArea; cmd_buffer->state.render_area = pRenderPassBeginInfo->renderArea;
anv_measure_beginrenderpass(cmd_buffer); anv_measure_beginrenderpass(cmd_buffer);
result = genX(cmd_buffer_setup_attachments)(cmd_buffer, pass, result = genX(cmd_buffer_setup_attachments)(cmd_buffer, pass,
framebuffer, framebuffer,
pRenderPassBegin); pRenderPassBeginInfo);
if (result != VK_SUCCESS) { if (result != VK_SUCCESS) {
assert(anv_batch_has_error(&cmd_buffer->batch)); assert(anv_batch_has_error(&cmd_buffer->batch));
return; return;
@ -6008,18 +6008,10 @@ void genX(CmdBeginRenderPass)(
cmd_buffer_begin_subpass(cmd_buffer, 0); cmd_buffer_begin_subpass(cmd_buffer, 0);
} }
void genX(CmdBeginRenderPass2)( void genX(CmdNextSubpass2)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
const VkRenderPassBeginInfo* pRenderPassBeginInfo, const VkSubpassBeginInfoKHR* pSubpassBeginInfo,
const VkSubpassBeginInfoKHR* pSubpassBeginInfo) const VkSubpassEndInfoKHR* pSubpassEndInfo)
{
genX(CmdBeginRenderPass)(commandBuffer, pRenderPassBeginInfo,
pSubpassBeginInfo->contents);
}
void genX(CmdNextSubpass)(
VkCommandBuffer commandBuffer,
VkSubpassContents contents)
{ {
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
@ -6033,16 +6025,9 @@ void genX(CmdNextSubpass)(
cmd_buffer_begin_subpass(cmd_buffer, prev_subpass + 1); cmd_buffer_begin_subpass(cmd_buffer, prev_subpass + 1);
} }
void genX(CmdNextSubpass2)( void genX(CmdEndRenderPass2)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
const VkSubpassBeginInfoKHR* pSubpassBeginInfo,
const VkSubpassEndInfoKHR* pSubpassEndInfo) const VkSubpassEndInfoKHR* pSubpassEndInfo)
{
genX(CmdNextSubpass)(commandBuffer, pSubpassBeginInfo->contents);
}
void genX(CmdEndRenderPass)(
VkCommandBuffer commandBuffer)
{ {
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
@ -6061,13 +6046,6 @@ void genX(CmdEndRenderPass)(
cmd_buffer->state.subpass = NULL; cmd_buffer->state.subpass = NULL;
} }
void genX(CmdEndRenderPass2)(
VkCommandBuffer commandBuffer,
const VkSubpassEndInfoKHR* pSubpassEndInfo)
{
genX(CmdEndRenderPass)(commandBuffer);
}
void void
genX(cmd_emit_conditional_render_predicate)(struct anv_cmd_buffer *cmd_buffer) genX(cmd_emit_conditional_render_predicate)(struct anv_cmd_buffer *cmd_buffer)
{ {