Fix clang format

OGRECave · Dec 5, 2024 · 04cf183 · 04cf183
1 parent b56819a
commit 04cf183
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 55 deletions.
diff --git a/RenderSystems/Vulkan/include/OgreVulkanDiscardBufferManager.h b/RenderSystems/Vulkan/include/OgreVulkanDiscardBufferManager.h
@@ -97,6 +97,7 @@ namespace Ogre
 
         void notifyDeviceLost() override;
         void notifyDeviceRestored( unsigned pass ) override;
+
     public:
         VulkanDiscardBufferManager( VulkanDevice *device, VaoManager *vaoManager );
         ~VulkanDiscardBufferManager();

diff --git a/RenderSystems/Vulkan/include/OgreVulkanGpuProgramManager.h b/RenderSystems/Vulkan/include/OgreVulkanGpuProgramManager.h
@@ -31,8 +31,8 @@ THE SOFTWARE.
 
 #include "OgreVulkanPrerequisites.h"
 
-#include "OgreVulkanDeviceResource.h"
 #include "OgreGpuProgramManager.h"
+#include "OgreVulkanDeviceResource.h"
 
 #include "vulkan/vulkan_core.h"
 

diff --git a/RenderSystems/Vulkan/src/OgreVulkanCache.cpp b/RenderSystems/Vulkan/src/OgreVulkanCache.cpp
@@ -183,19 +183,11 @@ namespace Ogre
     //-------------------------------------------------------------------------
     VulkanCache::VulkanCache( VulkanDevice *device ) : mDevice( device ) {}
     //-------------------------------------------------------------------------
-    VulkanCache::~VulkanCache()
-    {
-        destroy();
-    }
+    VulkanCache::~VulkanCache() { destroy(); }
     //-------------------------------------------------------------------------
-    void VulkanCache::notifyDeviceLost()
-    {
-        destroy();
-    }
+    void VulkanCache::notifyDeviceLost() { destroy(); }
     //-------------------------------------------------------------------------
-    void VulkanCache::notifyDeviceRestored( unsigned pass )
-    {
-    }
+    void VulkanCache::notifyDeviceRestored( unsigned pass ) {}
     //-------------------------------------------------------------------------
     void VulkanCache::destroy()
     {

diff --git a/RenderSystems/Vulkan/src/OgreVulkanDiscardBufferManager.cpp b/RenderSystems/Vulkan/src/OgreVulkanDiscardBufferManager.cpp
@@ -43,15 +43,9 @@ namespace Ogre
         createVkResources();
     }
 
-    VulkanDiscardBufferManager::~VulkanDiscardBufferManager()
-    {
-        destroyVkResources();
-    }
+    VulkanDiscardBufferManager::~VulkanDiscardBufferManager() { destroyVkResources(); }
 
-    void VulkanDiscardBufferManager::notifyDeviceLost()
-    {
-        destroyVkResources();
-    }
+    void VulkanDiscardBufferManager::notifyDeviceLost() { destroyVkResources(); }
 
     void VulkanDiscardBufferManager::notifyDeviceRestored( unsigned pass )
     {

diff --git a/RenderSystems/Vulkan/src/OgreVulkanGpuProgramManager.cpp b/RenderSystems/Vulkan/src/OgreVulkanGpuProgramManager.cpp
@@ -125,14 +125,9 @@ namespace Ogre
         mDescriptorSetMap.clear();
     }
     //-------------------------------------------------------------------------
-    void VulkanGpuProgramManager::notifyDeviceLost()
-    {
-        destroyDescriptorSetLayouts();
-    }
+    void VulkanGpuProgramManager::notifyDeviceLost() { destroyDescriptorSetLayouts(); }
     //-------------------------------------------------------------------------
-    void VulkanGpuProgramManager::notifyDeviceRestored( unsigned pass )
-    {
-    }
+    void VulkanGpuProgramManager::notifyDeviceRestored( unsigned pass ) {}
     //-------------------------------------------------------------------------
     bool VulkanGpuProgramManager::registerProgramFactory( const String &syntaxCode,
                                                           CreateGpuProgramCallback createFn )

diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderPassDescriptor.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderPassDescriptor.cpp
@@ -66,10 +66,7 @@ namespace Ogre
     //-----------------------------------------------------------------------------------
     VulkanRenderPassDescriptor::~VulkanRenderPassDescriptor() { releaseFbo(); }
     //-----------------------------------------------------------------------------------
-    void VulkanRenderPassDescriptor::notifyDeviceLost()
-    {
-        releaseFbo();
-    }
+    void VulkanRenderPassDescriptor::notifyDeviceLost() { releaseFbo(); }
     //-----------------------------------------------------------------------------------
     void VulkanRenderPassDescriptor::notifyDeviceRestored( unsigned pass )
     {

diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp
@@ -1304,7 +1304,6 @@ namespace Ogre
         }
 
         return true;
-
     }
     //-------------------------------------------------------------------------
     void VulkanRenderSystem::handleDeviceLost()

diff --git a/RenderSystems/Vulkan/src/OgreVulkanRootLayout.cpp b/RenderSystems/Vulkan/src/OgreVulkanRootLayout.cpp
@@ -107,9 +107,7 @@ namespace Ogre
         mPools.resize( 0 );
     }
     //-------------------------------------------------------------------------
-    void VulkanRootLayout::notifyDeviceRestored( unsigned pass )
-    {
-    }
+    void VulkanRootLayout::notifyDeviceRestored( unsigned pass ) {}
     //-------------------------------------------------------------------------
     void VulkanRootLayout::copyFrom( const RootLayout &rootLayout, bool bIncludeArrayBindings )
     {

diff --git a/RenderSystems/Vulkan/src/OgreVulkanTextureGpuManager.cpp b/RenderSystems/Vulkan/src/OgreVulkanTextureGpuManager.cpp
@@ -56,10 +56,7 @@ namespace Ogre
         createVkResources();
     }
     //-----------------------------------------------------------------------------------
-    VulkanTextureGpuManager::~VulkanTextureGpuManager()
-    {
-        destroyVkResources( true );
-    }
+    VulkanTextureGpuManager::~VulkanTextureGpuManager() { destroyVkResources( true ); }
     //-----------------------------------------------------------------------------------
     void VulkanTextureGpuManager::createVkResources()
     {
@@ -104,7 +101,7 @@ namespace Ogre
 
         // Use a VulkanStagingTexture but we will manually handle the upload.
         // The barriers are easy because there is no work using any of this data
-        VulkanVaoManager *vaoManager = static_cast<VulkanVaoManager *>( mVaoManager ); 
+        VulkanVaoManager *vaoManager = static_cast<VulkanVaoManager *>( mVaoManager );
         VulkanStagingTexture *stagingTex =
             vaoManager->createStagingTexture( PFG_RGBA8_UNORM, sizeof( c_whiteData ) * 2u );
 
@@ -173,8 +170,7 @@ namespace Ogre
                 memRequirements, mBlankTexture[i].vboPoolIdx, mBlankTexture[i].internalBufferStart );
 
             VkResult result = vkBindImageMemory( mDevice->mDevice, mBlankTexture[i].vkImage,
-                                                 deviceMemory,
-                                                 mBlankTexture[i].internalBufferStart );
+                                                 deviceMemory, mBlankTexture[i].internalBufferStart );
             checkVkResult( result, "vkBindImageMemory" );
         }
 

diff --git a/RenderSystems/Vulkan/src/Vao/OgreVulkanVaoManager.cpp b/RenderSystems/Vulkan/src/Vao/OgreVulkanVaoManager.cpp
@@ -119,10 +119,7 @@ namespace Ogre
         }
     }
     //-----------------------------------------------------------------------------------
-    VulkanVaoManager::~VulkanVaoManager()
-    {
-        destroyVkResources( true );
-    }
+    VulkanVaoManager::~VulkanVaoManager() { destroyVkResources( true ); }
     //-----------------------------------------------------------------------------------
     void VulkanVaoManager::createVkResources()
     {
@@ -218,7 +215,7 @@ namespace Ogre
 
         deleteStagingBuffers();
 
-        for( VulkanDelayedFuncBaseArray& fnFrame : mDelayedFuncs )
+        for( VulkanDelayedFuncBaseArray &fnFrame : mDelayedFuncs )
         {
             for( VulkanDelayedFuncBase *fn : fnFrame )
             {

diff --git a/RenderSystems/Vulkan/src/Windowing/Android/OgreVulkanAndroidWindow.cpp b/RenderSystems/Vulkan/src/Windowing/Android/OgreVulkanAndroidWindow.cpp
@@ -74,10 +74,7 @@ namespace Ogre
     {
     }
     //-------------------------------------------------------------------------
-    VulkanAndroidWindow::~VulkanAndroidWindow()
-    {
-        destroy();
-    }
+    VulkanAndroidWindow::~VulkanAndroidWindow() { destroy(); }
     //-----------------------------------------------------------------------------------
     const char *VulkanAndroidWindow::getRequiredExtensionName()
     {

diff --git a/RenderSystems/Vulkan/src/Windowing/win32/OgreVulkanWin32Window.cpp b/RenderSystems/Vulkan/src/Windowing/win32/OgreVulkanWin32Window.cpp
@@ -91,10 +91,7 @@ namespace Ogre
 #endif
     }
     //-------------------------------------------------------------------------
-    VulkanWin32Window::~VulkanWin32Window()
-    {
-        destroy();
-    }
+    VulkanWin32Window::~VulkanWin32Window() { destroy(); }
     //-------------------------------------------------------------------------
     const char *VulkanWin32Window::getRequiredExtensionName()
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1304,7 +1304,6 @@ namespace Ogre @@
             }
             return true;
         }
         //-------------------------------------------------------------------------
         void VulkanRenderSystem::handleDeviceLost()
@@ Expand Down @@