[VK]Fix crash when RenderWindow is exclusively in the resolve texture

Advanced users can use explicit MSAA and resolve directly into the RenderWindow. This is allowed, but would cause a crash on Vulkan if the swapchain is recreated.
OGRECave · Oct 19, 2023 · 651759e · 651759e
1 parent e53f570
commit 651759e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderPassDescriptor.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderPassDescriptor.cpp
@@ -690,17 +690,23 @@ namespace Ogre
     //-----------------------------------------------------------------------------------
     void VulkanRenderPassDescriptor::notifySwapchainCreated( VulkanWindow *window )
     {
-        if( mNumColourEntries > 0 && mColour[0].texture->isRenderWindowSpecific() &&
-            mColour[0].texture == window->getTexture() )
+        if( mNumColourEntries > 0 &&
+            ( ( mColour[0].texture && mColour[0].texture->isRenderWindowSpecific() &&
+                mColour[0].texture == window->getTexture() ) ||
+              ( mColour[0].resolveTexture && mColour[0].resolveTexture->isRenderWindowSpecific() &&
+                mColour[0].resolveTexture == window->getTexture() ) ) )
         {
             entriesModified( RenderPassDescriptor::All );
         }
     }
     //-----------------------------------------------------------------------------------
     void VulkanRenderPassDescriptor::notifySwapchainDestroyed( VulkanWindow *window )
     {
-        if( mNumColourEntries > 0 && mColour[0].texture->isRenderWindowSpecific() &&
-            mColour[0].texture == window->getTexture() )
+        if( mNumColourEntries > 0 &&
+            ( ( mColour[0].texture && mColour[0].texture->isRenderWindowSpecific() &&
+                mColour[0].texture == window->getTexture() ) ||
+              ( mColour[0].resolveTexture && mColour[0].resolveTexture->isRenderWindowSpecific() &&
+                mColour[0].resolveTexture == window->getTexture() ) ) )
         {
             releaseFbo();
         }