[Vk] Fix validateSampleDescription

OGRECave · Apr 17, 2024 · 3b39603 · 3b39603
1 parent b0d9be8
commit 3b39603
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp
@@ -3745,6 +3745,7 @@ namespace Ogre
         }
     }
     //-------------------------------------------------------------------------
+    inline bool isPowerOf2( uint32 x ) { return ( x & ( x - 1u ) ) == 0u; }
     SampleDescription VulkanRenderSystem::validateSampleDescription( const SampleDescription &sampleDesc,
                                                                      PixelFormatGpu format,
                                                                      uint32 textureFlags,
@@ -3856,11 +3857,12 @@ namespace Ogre
             }
 
             uint8 samples = sampleDesc.getColourSamples();
+            OGRE_ASSERT_LOW( isPowerOf2( samples ) );
             while( samples > 0u )
             {
-                if( supportedSampleCounts & ( 1u << ( samples - 1u ) ) )
+                if( supportedSampleCounts & samples )
                     return SampleDescription( samples, sampleDesc.getMsaaPattern() );
-                --samples;
+                samples = samples >> 1u;
             }
 
             // Ouch. The format is not supported. Return "something".