[GL3+] sRGB RenderTextures were forced to always on

Report by Scorg https://forums.ogre3d.org/viewtopic.php?f=25&t=95996
OGRECave · Sep 19, 2020 · 40dcea7 · 40dcea7
1 parent d2ca463
commit 40dcea7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/RenderSystems/GL3Plus/include/OgreGL3PlusRenderPassDescriptor.h b/RenderSystems/GL3Plus/include/OgreGL3PlusRenderPassDescriptor.h
@@ -64,6 +64,7 @@ namespace Ogre
         bool    mAllClearColoursSetAndIdentical;
         bool    mAnyColourLoadActionsSetToClear;
         bool    mHasRenderWindow;
+        bool    mHasSRGB;
 
         GL3PlusFrameBufferDescMap::iterator mSharedFboItor;
 

diff --git a/RenderSystems/GL3Plus/src/OgreGL3PlusRenderPassDescriptor.cpp b/RenderSystems/GL3Plus/src/OgreGL3PlusRenderPassDescriptor.cpp
@@ -44,6 +44,7 @@ namespace Ogre
         mAllClearColoursSetAndIdentical( false ),
         mAnyColourLoadActionsSetToClear( false ),
         mHasRenderWindow( false ),
+        mHasSRGB( false ),
         mSharedFboItor( renderSystem->_getFrameBufferDescMap().end() ),
         mRenderSystem( renderSystem )
     {
@@ -207,6 +208,7 @@ namespace Ogre
         }
 
         bool needsMsaaResolveFbo = false;
+        mHasSRGB = false;
 
         //Attach colour entries
         for( size_t i=0; i<mNumColourEntries; ++i )
@@ -218,6 +220,9 @@ namespace Ogre
                              "GL3PlusRenderPassDescriptor::updateColourFbo" );
             }
 
+            if( PixelFormatGpuUtils::isSRgb( mColour[i].texture->getPixelFormat() ) )
+                mHasSRGB |= true;
+
             if( !mHasRenderWindow && mColour[i].texture->getPixelFormat() != PFG_NULL )
             {
                 assert( dynamic_cast<GL3PlusTextureGpu*>( mColour[i].texture ) );
@@ -487,7 +492,17 @@ namespace Ogre
             OCGE( glDrawBuffers( mNumColourEntries, colourBuffs ) );
         }
 
-        OCGE( glEnable( GL_FRAMEBUFFER_SRGB ) );
+        if( entriesToFlush & RenderPassDescriptor::Colour )
+        {
+            if( mHasSRGB )
+            {
+                OCGE( glEnable( GL_FRAMEBUFFER_SRGB ) );
+            }
+            else
+            {
+                OCGE( glDisable( GL_FRAMEBUFFER_SRGB ) );
+            }
+        }
 
         const RenderSystemCapabilities *capabilities = mRenderSystem->getCapabilities();
         const bool isTiler = capabilities->hasCapability( RSC_IS_TILER );