[Vk] move common pixelFormat, sampleDescription, depthDefaults setup …

…code into VulkanWindowSwapChainBased::createSwapchain()
OGRECave · Feb 11, 2025 · 778153b · 778153b
1 parent b538072
commit 778153b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 93 deletions.
diff --git a/RenderSystems/Vulkan/src/OgreVulkanWindow.cpp b/RenderSystems/Vulkan/src/OgreVulkanWindow.cpp
@@ -295,6 +295,34 @@ namespace Ogre
     {
         mSuboptimal = false;
 
+        // Update pixelFormat, sample description, depth buffer defaults
+        mTexture->setPixelFormat( chooseSurfaceFormat( mHwGamma ) );
+        if( mDepthBuffer )
+        {
+            mDepthBuffer->setPixelFormat( DepthBuffer::DefaultDepthBufferFormat );
+            if( PixelFormatGpuUtils::isStencil( mDepthBuffer->getPixelFormat() ) )
+                mStencilBuffer = mDepthBuffer;
+        }
+
+        mSampleDescription = mDevice->mRenderSystem->validateSampleDescription(
+            mRequestedSampleDescription, mTexture->getPixelFormat(),
+            TextureFlags::NotTexture | TextureFlags::RenderWindowSpecific );
+        mTexture->_setSampleDescription( mRequestedSampleDescription, mSampleDescription );
+        if( mDepthBuffer )
+            mDepthBuffer->_setSampleDescription( mRequestedSampleDescription, mSampleDescription );
+
+        if( mDepthBuffer )
+        {
+            mTexture->_setDepthBufferDefaults( mDepthBuffer->isTilerMemoryless()
+                                                   ? DepthBuffer::POOL_MEMORYLESS
+                                                   : DepthBuffer::NO_POOL_EXPLICIT_RTV,
+                                               false, mDepthBuffer->getPixelFormat() );
+        }
+        else
+        {
+            mTexture->_setDepthBufferDefaults( DepthBuffer::POOL_NO_DEPTH, false, PFG_NULL );
+        }
+
         VkSurfaceCapabilitiesKHR surfaceCaps;
         VkResult result = vkGetPhysicalDeviceSurfaceCapabilitiesKHR( mDevice->mPhysicalDevice,
                                                                      mSurfaceKHR, &surfaceCaps );

diff --git a/RenderSystems/Vulkan/src/Windowing/Android/OgreVulkanAndroidWindow.cpp b/RenderSystems/Vulkan/src/Windowing/Android/OgreVulkanAndroidWindow.cpp
@@ -362,12 +362,6 @@ namespace Ogre
         if( !mNativeWindow )
             return;
 
-        mClosed = false;
-        mFocused = true;
-        // WindowEventUtilities::_addRenderWindow( this );
-
-        createSurface();
-
         const uint32 newWidth = static_cast<uint32>( ANativeWindow_getWidth( mNativeWindow ) );
         const uint32 newHeight = static_cast<uint32>( ANativeWindow_getHeight( mNativeWindow ) );
 
@@ -376,37 +370,7 @@ namespace Ogre
 
         setFinalResolution( mRequestedWidth, mRequestedHeight );
 
-        // mTexture is in OnStorage only once ever: at startup. Set these parameters once
-        if( mTexture->getResidencyStatus() == GpuResidency::OnStorage )
-        {
-            mTexture->setPixelFormat( chooseSurfaceFormat( mHwGamma ) );
-            if( mDepthBuffer )
-            {
-                mDepthBuffer->setPixelFormat( DepthBuffer::DefaultDepthBufferFormat );
-                if( PixelFormatGpuUtils::isStencil( mDepthBuffer->getPixelFormat() ) )
-                    mStencilBuffer = mDepthBuffer;
-            }
-
-            mSampleDescription = mDevice->mRenderSystem->validateSampleDescription(
-                mRequestedSampleDescription, mTexture->getPixelFormat(),
-                TextureFlags::NotTexture | TextureFlags::RenderWindowSpecific );
-            mTexture->_setSampleDescription( mRequestedSampleDescription, mSampleDescription );
-            if( mDepthBuffer )
-                mDepthBuffer->_setSampleDescription( mRequestedSampleDescription, mSampleDescription );
-
-            if( mDepthBuffer )
-            {
-                mTexture->_setDepthBufferDefaults( mDepthBuffer->isTilerMemoryless()
-                                                       ? DepthBuffer::POOL_MEMORYLESS
-                                                       : DepthBuffer::NO_POOL_EXPLICIT_RTV,
-                                                   false, mDepthBuffer->getPixelFormat() );
-            }
-            else
-            {
-                mTexture->_setDepthBufferDefaults( DepthBuffer::POOL_NO_DEPTH, false, PFG_NULL );
-            }
-        }
-
+        createSurface();
         createSwapchain();
     }
     //-------------------------------------------------------------------------

diff --git a/RenderSystems/Vulkan/src/Windowing/X11/OgreVulkanXcbWindow.cpp b/RenderSystems/Vulkan/src/Windowing/X11/OgreVulkanXcbWindow.cpp
@@ -205,32 +205,6 @@ namespace Ogre
         mStencilBuffer = 0;
 
         setFinalResolution( mRequestedWidth, mRequestedHeight );
-        mTexture->setPixelFormat( chooseSurfaceFormat( mHwGamma ) );
-        if( mDepthBuffer )
-        {
-            mDepthBuffer->setPixelFormat( DepthBuffer::DefaultDepthBufferFormat );
-            if( PixelFormatGpuUtils::isStencil( mDepthBuffer->getPixelFormat() ) )
-                mStencilBuffer = mDepthBuffer;
-        }
-
-        mSampleDescription = mDevice->mRenderSystem->validateSampleDescription(
-            mRequestedSampleDescription, mTexture->getPixelFormat(),
-            TextureFlags::NotTexture | TextureFlags::RenderWindowSpecific );
-        mTexture->_setSampleDescription( mRequestedSampleDescription, mSampleDescription );
-        if( mDepthBuffer )
-            mDepthBuffer->_setSampleDescription( mRequestedSampleDescription, mSampleDescription );
-
-        if( mDepthBuffer )
-        {
-            mTexture->_setDepthBufferDefaults( mDepthBuffer->isTilerMemoryless()
-                                                   ? DepthBuffer::POOL_MEMORYLESS
-                                                   : DepthBuffer::NO_POOL_EXPLICIT_RTV,
-                                               false, mDepthBuffer->getPixelFormat() );
-        }
-        else
-        {
-            mTexture->_setDepthBufferDefaults( DepthBuffer::POOL_NO_DEPTH, false, PFG_NULL );
-        }
 
         createSwapchain();
     }

diff --git a/RenderSystems/Vulkan/src/Windowing/win32/OgreVulkanWin32Window.cpp b/RenderSystems/Vulkan/src/Windowing/win32/OgreVulkanWin32Window.cpp
@@ -532,36 +532,6 @@ namespace Ogre
 
         setFinalResolution( mRequestedWidth, mRequestedHeight );
 
-        // if( mColourDepth == 16u )
-        //     mTexture->setPixelFormat( PFG_B5G5R5A1_UNORM );
-        // else
-        mTexture->setPixelFormat( chooseSurfaceFormat( mHwGamma ) );
-        if( mDepthBuffer )
-        {
-            mDepthBuffer->setPixelFormat( DepthBuffer::DefaultDepthBufferFormat );
-            if( PixelFormatGpuUtils::isStencil( mDepthBuffer->getPixelFormat() ) )
-                mStencilBuffer = mDepthBuffer;
-        }
-
-        mSampleDescription = mDevice->mRenderSystem->validateSampleDescription(
-            mRequestedSampleDescription, mTexture->getPixelFormat(),
-            TextureFlags::NotTexture | TextureFlags::RenderWindowSpecific );
-        mTexture->_setSampleDescription( mRequestedSampleDescription, mSampleDescription );
-        if( mDepthBuffer )
-            mDepthBuffer->_setSampleDescription( mRequestedSampleDescription, mSampleDescription );
-
-        if( mDepthBuffer )
-        {
-            mTexture->_setDepthBufferDefaults( mDepthBuffer->isTilerMemoryless()
-                                                   ? DepthBuffer::POOL_MEMORYLESS
-                                                   : DepthBuffer::NO_POOL_EXPLICIT_RTV,
-                                               false, mDepthBuffer->getPixelFormat() );
-        }
-        else
-        {
-            mTexture->_setDepthBufferDefaults( DepthBuffer::POOL_NO_DEPTH, false, PFG_NULL );
-        }
-
         createSwapchain();
 
         setHidden( mHidden );