commit a32436bf5e4ce686e72fef8499d3ca9eb2b2502b
author Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Oct 21 18:11:04 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 23 17:32:04 2015 -0600
tree 53baed3854b560d740b15f4ee18e65883a88aa37
parent 63f0ead42f862f1c8ad815798c7cc6983cc413ac

bug-14786: CmdBufferOptimizeFlags -> CmdBufferUsageFlags

layers/param_checker.cpp

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index b217886..989a6bd 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -1640,13 +1640,11 @@
 }
 
 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 @@
 }
 
 static
-std::string EnumeratorString(VkCmdBufferOptimizeFlagBits const& enumerator)
+std::string EnumeratorString(VkCmdBufferUsageFlags const& enumerator)
 {
     if(!ValidateEnumerator(enumerator))
     {
@@ -1664,25 +1662,17 @@
     }
 
     std::vector<std::string> 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;