[Vk] pass Vulkan windows through validateSampleDescription, fixed "Validation Error: [ VUID-VkImageCreateInfo-samples-02258 ] | MessageID = 0x5fccc613 | vkCreateImage(): pCreateInfo->samples (VK_SAMPLE_COUNT_2_BIT) is not supported by format VK_FORMAT_R8G8B8A8_SRGB"

Author: eugenegff

OgreMain/include/OgreRenderSystem.h

@@ -316,16 +316,15 @@ namespace Ogre
             See TextureFlags::TextureFlags.
             Relevant flags are:
                 NotTexture
+                RenderToTexture
                 Uav
-        @param depthTextureFlags
-            Only used if format is a colour pixel format.
-            Same as textureFlags, but for associated depth buffer if format.
+                RenderWindowSpecific
         @return
             Supported sample description for requested FSAA mode, with graceful downgrading.
         */
         virtual SampleDescription validateSampleDescription( const SampleDescription &sampleDesc,
-                                                             PixelFormatGpu format, uint32 textureFlags,
-                                                             uint32 depthTextureFlags );
+                                                             PixelFormatGpu           format,
+                                                             uint32                   textureFlags );
 
         /** Creates a new rendering window.
         @remarks

OgreMain/src/OgreRenderSystem.cpp

@@ -811,8 +811,7 @@ namespace Ogre
     //-----------------------------------------------------------------------
     SampleDescription RenderSystem::validateSampleDescription( const SampleDescription &sampleDesc,
                                                                PixelFormatGpu format,
-                                                               uint32 textureFlags,
-                                                               uint32 depthTextureFlags )
+                                                               uint32 textureFlags )
     {
         SampleDescription retVal( sampleDesc.getMaxSamples(), sampleDesc.getMsaaPattern() );
         return retVal;

OgreMain/src/OgreTextureGpu.cpp

@@ -450,13 +450,9 @@ namespace Ogre
                 uint32 msaaTextureFlags = TextureFlags::NotTexture;
                 if( hasMsaaExplicitResolves() )
                     msaaTextureFlags = mTextureFlags;
-                uint32 depthFormatTextureFlags = 0u;
-                if( !getPreferDepthTexture() )
-                    depthFormatTextureFlags = TextureFlags::NotTexture;
 
                 mSampleDescription = mTextureManager->getRenderSystem()->validateSampleDescription(
-                    mRequestedSampleDescription, mPixelFormat, msaaTextureFlags,
-                    depthFormatTextureFlags );
+                    mRequestedSampleDescription, mPixelFormat, msaaTextureFlags );
             }
             if( !( mSampleDescription == mRequestedSampleDescription ) )
                 notifyAllListenersTextureChanged( TextureGpuListener::FsaaSettingAlteredByApi, 0 );

RenderSystems/Direct3D11/include/OgreD3D11RenderSystem.h

@@ -334,8 +334,8 @@ namespace Ogre
         void postExtraThreadsStarted() override;
 
         SampleDescription validateSampleDescription( const SampleDescription &sampleDesc,
-                                                     PixelFormatGpu format, uint32 textureFlags,
-                                                     uint32 depthTextureFlags ) override;
+                                                     PixelFormatGpu           format,
+                                                     uint32                   textureFlags ) override;
 
         /// @copydoc RenderSystem::getDisplayMonitorCount
         unsigned int getDisplayMonitorCount() const override;

RenderSystems/Direct3D11/src/OgreD3D11RenderSystem.cpp

@@ -3707,8 +3707,7 @@ namespace Ogre
     //---------------------------------------------------------------------
     SampleDescription D3D11RenderSystem::validateSampleDescription( const SampleDescription &sampleDesc,
                                                                     PixelFormatGpu format,
-                                                                    uint32 textureFlags,
-                                                                    uint32 depthTextureFlags )
+                                                                    uint32 textureFlags )
     {
         OGRE_UNUSED_VAR( textureFlags );
         OGRE_UNUSED_VAR( depthTextureFlags );

RenderSystems/Direct3D11/src/OgreD3D11Window.cpp

@@ -336,9 +336,9 @@ namespace Ogre
         if( mUseFlipMode )
         {
             // swapchain is not multisampled in flip sequential mode, so we reuse it
-            // D3D11 doesn't care about texture flags, so we leave them as 0.
-            mSampleDescription = mRenderSystem->validateSampleDescription( mRequestedSampleDescription,
-                                                                           _getRenderFormat(), 0u, 0u );
+            mSampleDescription = mRenderSystem->validateSampleDescription(
+                mRequestedSampleDescription, _getRenderFormat(),
+                TextureFlags::NotTexture | TextureFlags::RenderWindowSpecific );
         }
         else
         {

RenderSystems/Direct3D11/src/Windowing/WIN32/OgreD3D11WindowHwnd.cpp

@@ -158,9 +158,9 @@ namespace Ogre
     //-----------------------------------------------------------------------------------
     HRESULT D3D11WindowHwnd::_createSwapChainImpl()
     {
-        // D3D11 doesn't care about texture flags, so we leave them as 0.
-        mSampleDescription = mRenderSystem->validateSampleDescription( mRequestedSampleDescription,
-                                                                       _getRenderFormat(), 0u, 0u );
+        mSampleDescription = mRenderSystem->validateSampleDescription(
+            mRequestedSampleDescription, _getRenderFormat(),
+            TextureFlags::NotTexture | TextureFlags::RenderWindowSpecific );
         HRESULT hr;
 
         // Create swap chain

RenderSystems/Direct3D11/src/Windowing/WIN32/OgreD3D11WindowWinRT.cpp

@@ -118,8 +118,8 @@ namespace Ogre
     {
 #    if !__OGRE_WINRT_PHONE
         mSampleDescription = mRenderSystem->validateSampleDescription(
-            mRequestedSampleDescription, _getRenderFormat(), TextureFlags::NotTexture,
-            TextureFlags::NotTexture );
+            mRequestedSampleDescription, _getRenderFormat(),
+            TextureFlags::NotTexture | TextureFlags::RenderWindowSpecific );
 #    endif
         DXGI_SWAP_CHAIN_DESC1 desc = {};
         desc.Width = 0;  // Use automatic sizing.
@@ -276,8 +276,8 @@ namespace Ogre
     {
 #    if !__OGRE_WINRT_PHONE
         mSampleDescription = mRenderSystem->validateSampleDescription(
-            mRequestedSampleDescription, _getRenderFormat(), TextureFlags::NotTexture,
-            TextureFlags::NotTexture );
+            mRequestedSampleDescription, _getRenderFormat(),
+            TextureFlags::NotTexture | TextureFlags::RenderWindowSpecific );
 #    endif
 
         int widthPx = std::max( 1, (int)floorf( mRequestedWidth * mCompositionScale.Width + 0.5f ) );

RenderSystems/Metal/include/OgreMetalRenderSystem.h

@@ -297,8 +297,8 @@ namespace Ogre
         unsigned int getDisplayMonitorCount() const override { return 1; }
 
         SampleDescription validateSampleDescription( const SampleDescription &sampleDesc,
-                                                     PixelFormatGpu format, uint32 textureFlags,
-                                                     uint32 depthTextureFlags ) override;
+                                                     PixelFormatGpu           format,
+                                                     uint32                   textureFlags ) override;
 
         const PixelFormatToShaderType *getPixelFormatToShaderType() const override;
 

RenderSystems/Metal/src/OgreMetalRenderSystem.mm

@@ -240,8 +240,7 @@ of this software and associated documentation files (the "Software"), to deal
     //-------------------------------------------------------------------------
     SampleDescription MetalRenderSystem::validateSampleDescription( const SampleDescription &sampleDesc,
                                                                     PixelFormatGpu format,
-                                                                    uint32 textureFlags,
-                                                                    uint32 depthTextureFlags )
+                                                                    uint32 textureFlags )
     {
         uint8 samples = sampleDesc.getMaxSamples();
         if( @available( iOS 9.0, * ) )