FramebufferGL: only work around SRGB blits on Desktop GL

src/libANGLE/renderer/gl/FramebufferGL.cpp

@@ -303,7 +303,7 @@ Error FramebufferGL::blit(ContextImpl *context,
             bool sourceSRGB =
                 readAttachment != nullptr && readAttachment->getColorEncoding() == GL_SRGB;
             needManualColorBlit =
-                needManualColorBlit || (sourceSRGB && !mFunctions->isAtLeastGL(gl::Version(4, 4)));
+                needManualColorBlit || (sourceSRGB && mFunctions->isAtMostGL(gl::Version(4, 3)));
         }
 
         // Prior to OpenGL 4.2 BlitFramebuffer (section 4.3.2 of GL 4.1 core profile) reads:
@@ -327,7 +327,7 @@ Error FramebufferGL::blit(ContextImpl *context,
             }
 
             needManualColorBlit =
-                needManualColorBlit || (destSRGB && !mFunctions->isAtLeastGL(gl::Version(4, 2)));
+                needManualColorBlit || (destSRGB && mFunctions->isAtMostGL(gl::Version(4, 1)));
         }
     }
 

src/libANGLE/renderer/gl/FunctionsGL.cpp

@@ -2283,11 +2283,21 @@ bool FunctionsGL::isAtLeastGL(const gl::Version &glVersion) const
     return standard == STANDARD_GL_DESKTOP && version >= glVersion;
 }
 
+bool FunctionsGL::isAtMostGL(const gl::Version &glVersion) const
+{
+    return standard == STANDARD_GL_DESKTOP && glVersion >= version;
+}
+
 bool FunctionsGL::isAtLeastGLES(const gl::Version &glesVersion) const
 {
     return standard == STANDARD_GL_ES && version >= glesVersion;
 }
 
+bool FunctionsGL::isAtMostGLES(const gl::Version &glesVersion) const
+{
+    return standard == STANDARD_GL_ES && glesVersion >= version;
+}
+
 bool FunctionsGL::hasExtension(const std::string &ext) const
 {
     return std::find(extensions.begin(), extensions.end(), ext) != extensions.end();

src/libANGLE/renderer/gl/FunctionsGL.h

@@ -36,7 +36,9 @@ class FunctionsGL
     StandardGL standard;
     GLint profile;
     bool isAtLeastGL(const gl::Version &glVersion) const;
+    bool isAtMostGL(const gl::Version &glVersion) const;
     bool isAtLeastGLES(const gl::Version &glesVersion) const;
+    bool isAtMostGLES(const gl::Version &glesVersion) const;
 
     // Extensions
     std::vector<std::string> extensions;