Vulkan: range loop refactoring (OGRECave#2947)

Joilnen · Oct 3, 2023 · 6d09582 · 6d09582
1 parent 6a50d66
commit 6d09582
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 34 deletions.
diff --git a/RenderSystems/Vulkan/src/OgreVulkanHardwareBufferManager.cpp b/RenderSystems/Vulkan/src/OgreVulkanHardwareBufferManager.cpp
@@ -46,26 +46,18 @@ namespace Ogre
     {
         {
             OGRE_LOCK_MUTEX( mVertexBuffersMutex );
-            VertexBufferList::const_iterator itor = mVertexBuffers.begin();
-            VertexBufferList::const_iterator end = mVertexBuffers.end();
-
-            while( itor != end )
+            for (auto& b : mVertexBuffers)
             {
-                auto hwBuffer = (*itor)->_getImpl<VulkanHardwareBuffer>();
+                auto hwBuffer = b->_getImpl<VulkanHardwareBuffer>();
                 hwBuffer->_notifyDeviceStalled();
-                ++itor;
             }
         }
         {
             OGRE_LOCK_MUTEX( mIndexBuffersMutex );
-            IndexBufferList::const_iterator itor = mIndexBuffers.begin();
-            IndexBufferList::const_iterator end = mIndexBuffers.end();
-
-            while( itor != end )
+            for (auto& i : mIndexBuffers)
             {
-                auto hwBuffer = (*itor)->_getImpl<VulkanHardwareBuffer>();
+                auto hwBuffer = i->_getImpl<VulkanHardwareBuffer>();
                 hwBuffer->_notifyDeviceStalled();
-                ++itor;
             }
         }
     }
@@ -105,4 +97,4 @@ namespace Ogre
         return std::make_shared<VulkanHardwareBuffer>(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, sizeBytes, usage, false,
                                                       mDevice);
     }
-}  // namespace Ogre
+}  // namespace Ogre
diff --git a/RenderSystems/Vulkan/src/OgreVulkanUtils.cpp b/RenderSystems/Vulkan/src/OgreVulkanUtils.cpp
@@ -44,29 +44,29 @@ namespace Ogre
         case VK_TIMEOUT:                        return "VK_TIMEOUT";
         case VK_EVENT_SET:                      return "VK_EVENT_SET";
         case VK_EVENT_RESET:                    return "VK_EVENT_RESET";
-        case VK_INCOMPLETE:                     return"VK_INCOMPLETE";
+        case VK_INCOMPLETE:                     return "VK_INCOMPLETE";
         case VK_ERROR_OUT_OF_HOST_MEMORY:       return "VK_ERROR_OUT_OF_HOST_MEMORY";
         case VK_ERROR_OUT_OF_DEVICE_MEMORY:     return "VK_ERROR_OUT_OF_DEVICE_MEMORY";
-        case VK_ERROR_INITIALIZATION_FAILED:    return"VK_ERROR_INITIALIZATION_FAILED";
-        case VK_ERROR_DEVICE_LOST:              return"VK_ERROR_DEVICE_LOST";
-        case VK_ERROR_MEMORY_MAP_FAILED:        return"VK_ERROR_MEMORY_MAP_FAILED";
-        case VK_ERROR_LAYER_NOT_PRESENT:        return"VK_ERROR_LAYER_NOT_PRESENT";
-        case VK_ERROR_EXTENSION_NOT_PRESENT:    return"VK_ERROR_EXTENSION_NOT_PRESENT";
-        case VK_ERROR_FEATURE_NOT_PRESENT:      return"VK_ERROR_FEATURE_NOT_PRESENT";
-        case VK_ERROR_INCOMPATIBLE_DRIVER:      return"VK_ERROR_INCOMPATIBLE_DRIVER";
-        case VK_ERROR_TOO_MANY_OBJECTS:         return"VK_ERROR_TOO_MANY_OBJECTS";
-        case VK_ERROR_FORMAT_NOT_SUPPORTED:     return"VK_ERROR_FORMAT_NOT_SUPPORTED";
-        case VK_ERROR_FRAGMENTED_POOL:          return"VK_ERROR_FRAGMENTED_POOL";
-        case VK_ERROR_OUT_OF_POOL_MEMORY:       return"VK_ERROR_OUT_OF_POOL_MEMORY";
-        case VK_ERROR_INVALID_EXTERNAL_HANDLE:  return"VK_ERROR_INVALID_EXTERNAL_HANDLE";
-        case VK_ERROR_SURFACE_LOST_KHR:         return"VK_ERROR_SURFACE_LOST_KHR";
-        case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR: return"VK_ERROR_NATIVE_WINDOW_IN_USE_KHR";
-        case VK_SUBOPTIMAL_KHR:                 return"VK_SUBOPTIMAL_KHR";
-        case VK_ERROR_OUT_OF_DATE_KHR:          return"VK_ERROR_OUT_OF_DATE_KHR";
-        case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR: return"VK_ERROR_INCOMPATIBLE_DISPLAY_KHR";
-        case VK_ERROR_VALIDATION_FAILED_EXT:    return"VK_ERROR_VALIDATION_FAILED_EXT";
-        case VK_ERROR_INVALID_SHADER_NV:        return"VK_ERROR_INVALID_SHADER_NV";
-        case VK_ERROR_NOT_PERMITTED_EXT:        return"VK_ERROR_NOT_PERMITTED_EXT";
+        case VK_ERROR_INITIALIZATION_FAILED:    return "VK_ERROR_INITIALIZATION_FAILED";
+        case VK_ERROR_DEVICE_LOST:              return "VK_ERROR_DEVICE_LOST";
+        case VK_ERROR_MEMORY_MAP_FAILED:        return "VK_ERROR_MEMORY_MAP_FAILED";
+        case VK_ERROR_LAYER_NOT_PRESENT:        return "VK_ERROR_LAYER_NOT_PRESENT";
+        case VK_ERROR_EXTENSION_NOT_PRESENT:    return "VK_ERROR_EXTENSION_NOT_PRESENT";
+        case VK_ERROR_FEATURE_NOT_PRESENT:      return "VK_ERROR_FEATURE_NOT_PRESENT";
+        case VK_ERROR_INCOMPATIBLE_DRIVER:      return "VK_ERROR_INCOMPATIBLE_DRIVER";
+        case VK_ERROR_TOO_MANY_OBJECTS:         return "VK_ERROR_TOO_MANY_OBJECTS";
+        case VK_ERROR_FORMAT_NOT_SUPPORTED:     return "VK_ERROR_FORMAT_NOT_SUPPORTED";
+        case VK_ERROR_FRAGMENTED_POOL:          return "VK_ERROR_FRAGMENTED_POOL";
+        case VK_ERROR_OUT_OF_POOL_MEMORY:       return "VK_ERROR_OUT_OF_POOL_MEMORY";
+        case VK_ERROR_INVALID_EXTERNAL_HANDLE:  return "VK_ERROR_INVALID_EXTERNAL_HANDLE";
+        case VK_ERROR_SURFACE_LOST_KHR:         return "VK_ERROR_SURFACE_LOST_KHR";
+        case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR: return "VK_ERROR_NATIVE_WINDOW_IN_USE_KHR";
+        case VK_SUBOPTIMAL_KHR:                 return "VK_SUBOPTIMAL_KHR";
+        case VK_ERROR_OUT_OF_DATE_KHR:          return "VK_ERROR_OUT_OF_DATE_KHR";
+        case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR: return "VK_ERROR_INCOMPATIBLE_DISPLAY_KHR";
+        case VK_ERROR_VALIDATION_FAILED_EXT:    return "VK_ERROR_VALIDATION_FAILED_EXT";
+        case VK_ERROR_INVALID_SHADER_NV:        return "VK_ERROR_INVALID_SHADER_NV";
+        case VK_ERROR_NOT_PERMITTED_EXT:        return "VK_ERROR_NOT_PERMITTED_EXT";
         default:
             return StringConverter::toString( result );
         }