From 62534c1eeb855c97e6ef2b46183972228120c199 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 21 Oct 2015 18:11:04 -0600 Subject: bug-14786: CmdBufferOptimizeFlags -> CmdBufferUsageFlags --- layers/param_checker.cpp | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) (limited to 'layers/param_checker.cpp') diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index b217886b..989a6bda 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -1640,13 +1640,11 @@ std::string EnumeratorString(VkCmdPoolResetFlagBits const& enumerator) } static -bool ValidateEnumerator(VkCmdBufferOptimizeFlagBits const& enumerator) +bool ValidateEnumerator(VkCmdBufferUsageFlags const& enumerator) { - VkCmdBufferOptimizeFlagBits allFlags = (VkCmdBufferOptimizeFlagBits)(VK_CMD_BUFFER_OPTIMIZE_NO_SIMULTANEOUS_USE_BIT | - VK_CMD_BUFFER_OPTIMIZE_DESCRIPTOR_SET_SWITCH_BIT | - VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT | - VK_CMD_BUFFER_OPTIMIZE_PIPELINE_SWITCH_BIT | - VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT); + VkCmdBufferUsageFlags allFlags = (VkCmdBufferUsageFlags)(VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT | + VK_CMD_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT | + VK_CMD_BUFFER_USAGE_SIMULTANEOUS_USE_BIT); if(enumerator & (~allFlags)) { return false; @@ -1656,7 +1654,7 @@ bool ValidateEnumerator(VkCmdBufferOptimizeFlagBits const& enumerator) } static -std::string EnumeratorString(VkCmdBufferOptimizeFlagBits const& enumerator) +std::string EnumeratorString(VkCmdBufferUsageFlags const& enumerator) { if(!ValidateEnumerator(enumerator)) { @@ -1664,25 +1662,17 @@ std::string EnumeratorString(VkCmdBufferOptimizeFlagBits const& enumerator) } std::vector strings; - if(enumerator & VK_CMD_BUFFER_OPTIMIZE_NO_SIMULTANEOUS_USE_BIT) + if(enumerator & VK_CMD_BUFFER_USAGE_SIMULTANEOUS_USE_BIT) { - strings.push_back("VK_CMD_BUFFER_OPTIMIZE_NO_SIMULTANEOUS_USE_BIT"); + strings.push_back("VK_CMD_BUFFER_USAGE_SIMULTANEOUS_USE_BIT"); } - if(enumerator & VK_CMD_BUFFER_OPTIMIZE_DESCRIPTOR_SET_SWITCH_BIT) + if(enumerator & VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT) { - strings.push_back("VK_CMD_BUFFER_OPTIMIZE_DESCRIPTOR_SET_SWITCH_BIT"); + strings.push_back("VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT"); } - if(enumerator & VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT) + if(enumerator & VK_CMD_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT) { - strings.push_back("VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT"); - } - if(enumerator & VK_CMD_BUFFER_OPTIMIZE_PIPELINE_SWITCH_BIT) - { - strings.push_back("VK_CMD_BUFFER_OPTIMIZE_PIPELINE_SWITCH_BIT"); - } - if(enumerator & VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT) - { - strings.push_back("VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT"); + strings.push_back("VK_CMD_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT"); } std::string enumeratorString; -- cgit v1.2.3