diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-06-26 15:34:39 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-07-06 10:42:09 +0800 |
| commit | 57b23b4df68eb77e9a87057c396da571e9168a19 (patch) | |
| tree | cb0036edf9d4cd881d64d55c64d1c7d718ab343d /layers/param_checker.cpp | |
| parent | 77be7d98c5b4e0f390b5845a57ec020a4cdbe481 (diff) | |
| download | usermoji-57b23b4df68eb77e9a87057c396da571e9168a19.tar.xz | |
update vulkan.h for multi-level command buffers (V121)
With minimal changes to keep everything building and functioning.
Diffstat (limited to 'layers/param_checker.cpp')
| -rw-r--r-- | layers/param_checker.cpp | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 95710f6a..9b925266 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -9476,8 +9476,7 @@ void PreCmdEndRenderPass( } void PostCmdEndRenderPass( - VkCmdBuffer cmdBuffer, - VkRenderPass renderPass) + VkCmdBuffer cmdBuffer) { if(cmdBuffer == nullptr) { @@ -9485,23 +9484,48 @@ void PostCmdEndRenderPass( "vkCmdEndRenderPass parameter, VkCmdBuffer cmdBuffer, is null pointer"); return; } +} - if(renderPass == nullptr) +void PreCmdExecuteCommands( + VkCmdBuffer cmdBuffer) +{ + if(cmdBuffer == nullptr) { log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK", - "vkCmdEndRenderPass parameter, VkRenderPass renderPass, is null pointer"); + "vkCmdExecuteCommands parameter, VkCmdBuffer cmdBuffer, is null pointer"); + return; + } +} + +void PostCmdExecuteCommands( + VkCmdBuffer cmdBuffer) +{ + if(cmdBuffer == nullptr) + { + log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK", + "vkCmdExecuteCommands parameter, VkCmdBuffer cmdBuffer, is null pointer"); return; } } VK_LAYER_EXPORT void VKAPI vkCmdEndRenderPass( - VkCmdBuffer cmdBuffer, - VkRenderPass renderPass) + VkCmdBuffer cmdBuffer) { PreCmdEndRenderPass(cmdBuffer); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdEndRenderPass(cmdBuffer, renderPass); + get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdEndRenderPass(cmdBuffer); + + PostCmdEndRenderPass(cmdBuffer); +} + +VK_LAYER_EXPORT void VKAPI vkCmdExecuteCommands( + VkCmdBuffer cmdBuffer, + uint32_t cmdBuffersCount, + const VkCmdBuffer* pCmdBuffers) +{ + PreCmdExecuteCommands(cmdBuffer); + get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdExecuteCommands(cmdBuffer, cmdBuffersCount, pCmdBuffers); - PostCmdEndRenderPass(cmdBuffer, renderPass); + PostCmdExecuteCommands(cmdBuffer); } VK_LAYER_EXPORT void* VKAPI vkGetDeviceProcAddr(VkDevice device, const char* funcName) @@ -9694,6 +9718,8 @@ VK_LAYER_EXPORT void* VKAPI vkGetDeviceProcAddr(VkDevice device, const char* fun return (void*) vkCmdBeginRenderPass; if (!strcmp(funcName, "vkCmdEndRenderPass")) return (void*) vkCmdEndRenderPass; + if (!strcmp(funcName, "vkCmdExecuteCommands")) + return (void*) vkCmdExecuteCommands; if (!strcmp(funcName, "vkGetGlobalExtensionCount")) return (void*) vkGetGlobalExtensionCount; if (!strcmp(funcName, "vkGetGlobalExtensionProperties")) |
