[Vk] Don't crash if VulkanRenderSystem::validateSampleDescription is …

…called before first window creation
OGRECave · Jun 1, 2022 · 1871a53 · 1871a53
1 parent dc52a1d
commit 1871a53
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp
@@ -3244,10 +3244,10 @@ namespace Ogre
     SampleDescription VulkanRenderSystem::validateSampleDescription( const SampleDescription &sampleDesc,
                                                                      PixelFormatGpu format )
     {
-        SampleDescription retVal(
-            (uint8)getMaxUsableSampleCount( mDevice->mDeviceProperties, sampleDesc.getMaxSamples() ),
-            sampleDesc.getMsaaPattern() );
-        return retVal;
+        uint8 samples = sampleDesc.getMaxSamples();
+        if( mDevice )
+            samples = (uint8)getMaxUsableSampleCount( mDevice->mDeviceProperties, samples );
+        return SampleDescription( samples, sampleDesc.getMsaaPattern() );
     }
     //-------------------------------------------------------------------------
     bool VulkanRenderSystem::isSameLayout( ResourceLayout::Layout a, ResourceLayout::Layout b,