Merge branch 'v2-3'

OGRECave · Oct 19, 2023 · b065174 · b065174
2 parents 6085437 + 651759e
commit b065174
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderPassDescriptor.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderPassDescriptor.cpp
@@ -694,17 +694,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();
         }