diff options
| author | Chris Forbes <chrisforbes@google.com> | 2016-05-17 15:31:00 +1200 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-05-19 08:48:42 -0600 |
| commit | 75a872d3d227876a0b35857043b86017f5b98c4d (patch) | |
| tree | 563afb1c59796e8819fff33cff6cf3e548c84635 /layers/core_validation.cpp | |
| parent | 2d2af8c6299282d561e7e6815de5d36f44388f46 (diff) | |
| download | usermoji-75a872d3d227876a0b35857043b86017f5b98c4d.tar.xz | |
layers: simplify TransitionSubpassLayouts
Signed-off-by: Chris Forbes <chrisforbes@google.com>
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index e64578b8..14a05f18 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -8783,10 +8783,8 @@ static bool VerifyFramebufferAndRenderPassLayouts(VkCommandBuffer cmdBuffer, con return skip_call; } -static void TransitionSubpassLayouts(VkCommandBuffer cmdBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, +static void TransitionSubpassLayouts(layer_data *dev_data, GLOBAL_CB_NODE *pCB, const VkRenderPassBeginInfo *pRenderPassBegin, const int subpass_index) { - layer_data *dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE *pCB = getCBNode(dev_data, cmdBuffer); auto renderPass = getRenderPass(dev_data, pRenderPassBegin->renderPass); if (!renderPass) return; @@ -8935,7 +8933,7 @@ VKAPI_ATTR void VKAPI_CALL CmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpa skipCall |= addCmd(dev_data, pCB, CMD_NEXTSUBPASS, "vkCmdNextSubpass()"); pCB->activeSubpass++; pCB->activeSubpassContents = contents; - TransitionSubpassLayouts(commandBuffer, &pCB->activeRenderPassBeginInfo, pCB->activeSubpass); + TransitionSubpassLayouts(dev_data, pCB, &pCB->activeRenderPassBeginInfo, pCB->activeSubpass); skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdNextSubpass"); } lock.unlock(); |