Use inverse multiply in resolve

Author: kristiker

GUI/Controls/GLViewerControl.cs

@@ -156,14 +156,9 @@ protected virtual SKBitmap ReadPixelsToBitmap()
             var bitmap = new SKBitmap(GLDefaultFramebuffer.Width, GLDefaultFramebuffer.Height, SKColorType.Bgra8888, SKAlphaType.Opaque);
             var pixels = bitmap.GetPixels(out var length);
 
-            if (MainFramebuffer != GLDefaultFramebuffer)
-            {
-                var (w, h) = (GLControl.Width, GLControl.Height);
-                GL.BlitNamedFramebuffer(MainFramebuffer.FboHandle, GLDefaultFramebuffer.FboHandle, 0, 0, w, h, 0, 0, w, h, ClearBufferMask.ColorBufferBit, BlitFramebufferFilter.Nearest);
-            }
+            BlitFramebufferMainToDefault();
 
-            GL.Flush();
-            GL.Finish();
+            GLDefaultFramebuffer.Bind(FramebufferTarget.ReadFramebuffer);
             GL.ReadPixels(0, 0, GLDefaultFramebuffer.Width, GLDefaultFramebuffer.Height, PixelFormat.Bgra, PixelType.UnsignedByte, pixels);
 
             // Flip y
@@ -528,13 +523,7 @@ private void Draw()
                 }
             }
 
-            if (MainFramebuffer != GLDefaultFramebuffer)
-            {
-                MainFramebuffer.Bind(FramebufferTarget.ReadFramebuffer);
-                GLDefaultFramebuffer.Bind(FramebufferTarget.DrawFramebuffer);
-
-                FramebufferBlit(MainFramebuffer, GLDefaultFramebuffer);
-            }
+            BlitFramebufferMainToDefault();
 
             if (Settings.Config.DisplayFps != 0)
             {
@@ -549,6 +538,19 @@ private void Draw()
             GLControl.Invalidate();
         }
 
+        private void BlitFramebufferMainToDefault()
+        {
+            if (MainFramebuffer == GLDefaultFramebuffer)
+            {
+                return; // not required
+            }
+
+            MainFramebuffer.Bind(FramebufferTarget.ReadFramebuffer);
+            GLDefaultFramebuffer.Bind(FramebufferTarget.DrawFramebuffer);
+
+            FramebufferBlit(MainFramebuffer, GLDefaultFramebuffer);
+        }
+
         /// <summary>
         /// Multisampling resolve, postprocess the image & convert to gamma.
         /// </summary>
@@ -583,7 +585,11 @@ private void HandleResize()
             }
 
             GLDefaultFramebuffer.Resize(w, h);
-            MainFramebuffer.Resize(w, h, NumSamples);
+
+            if (MainFramebuffer != GLDefaultFramebuffer)
+            {
+                MainFramebuffer.Resize(w, h, NumSamples);
+            }
 
             if (MainFramebuffer.InitialStatus == FramebufferErrorCode.FramebufferUndefined)
             {
@@ -596,6 +602,7 @@ private void HandleResize()
 
                     DisposeFramebuffer();
                     MainFramebuffer = GLDefaultFramebuffer;
+                    GL.Enable(EnableCap.FramebufferSrgb);
                 }
             }
 

GUI/Types/Renderer/Shaders/background.frag

@@ -57,20 +57,20 @@ void main() {
     float sky = pow(smoothstep(0.45, 0.6, upAmount), 2.0);
     float highSky = pow(smoothstep(0.6, 0.85, upAmount), 3.0);
 
-    vec3 SKY_C = vec3(128.0, 128.0, 128.0) / 255.0;
-    vec3 SKY_ALT_C = vec3(55.0, 55.0, 55.0) / 255.0;
-    vec3 HORIZON_C = vec3(55.0, 55.0, 55.0) / 255.0;
-    vec3 HORIZON_ALT_C = vec3(75.0, 75.0, 75.0) / 255.0;
-    vec3 GROUND_C = vec3(33.0, 33.0, 33.0) / 255.0;
-    vec3 GROUND_ALT_C = vec3(44.0, 40.0, 44.0) / 255.0;
+    vec3 SKY_C = vec3(128.0, 128.0, 128.0);
+    vec3 SKY_ALT_C = vec3(55.0, 55.0, 55.0);
+    vec3 HORIZON_C = vec3(55.0, 55.0, 55.0);
+    vec3 HORIZON_ALT_C = vec3(75.0, 75.0, 75.0);
+    vec3 GROUND_C = vec3(33.0, 33.0, 33.0);
+    vec3 GROUND_ALT_C = vec3(44.0, 40.0, 44.0);
 
     if (g_bShowLightBackground) {
-        SKY_C = vec3(99.0, 161.0, 196.0) / 255.0;
-        SKY_ALT_C = vec3(160.0, 187.0, 245.0) / 255.0;
-        HORIZON_C = vec3(161.0, 164.0, 132.0) / 255.0;
-        HORIZON_ALT_C = vec3(130.0, 184.0, 194.0) / 255.0;
-        GROUND_C = vec3(60.0, 126.0, 104.0) / 255.0;
-        GROUND_ALT_C = vec3(62.0, 95.0, 103.0) / 255.0;
+        SKY_C = vec3(99.0, 161.0, 196.0);
+        SKY_ALT_C = vec3(160.0, 187.0, 245.0);
+        HORIZON_C = vec3(161.0, 164.0, 132.0);
+        HORIZON_ALT_C = vec3(130.0, 184.0, 194.0);
+        GROUND_C = vec3(60.0, 126.0, 104.0);
+        GROUND_ALT_C = vec3(62.0, 95.0, 103.0);
     }
 
     // mixing the alternative colors to go through their alt version
@@ -85,7 +85,8 @@ void main() {
     vec3 skyToHighSky = mix(horizonToSky, SKY_C, highSky);
 
     // add a minute amount of noise to hide color banding
-    vec3 color = skyToHighSky + (1.0/255.0) * gradientNoise(gl_FragCoord.xy) - (0.5/255.0);
+    float noise = gradientNoise(gl_FragCoord.xy);
+    vec3 color = skyToHighSky + noise - 0.5;
 
-    outputColor = vec4(SrgbGammaToLinear(color), 1.0);
+    outputColor = vec4(SrgbGammaToLinear(color / 255f), 1.0);
 }

GUI/Types/Renderer/Shaders/common/utils.glsl

@@ -147,7 +147,7 @@ vec3 SrgbLinearToGamma( vec3 vLinearColor )
 {
 	// 15 asm instructions
 	vec3 vLinearSegment = vLinearColor.rgb * 12.92;
-	vec3 vExpSegment = ( 1.055 * pow( vLinearColor.rgb, vec3 ( 1.0 / 2.4, 1.0 / 2.4, 1.0 / 2.4 ) ) ) - 0.055;
+	vec3 vExpSegment = ( 1.055 * pow( vLinearColor.rgb, vec3 ( 1.0 / 2.4) )) - 0.055;
 
 	vec3 vGammaColor = vec3(( vLinearColor.r <= 0.0031308 ) ? vLinearSegment.r : vExpSegment.r,
                             ( vLinearColor.g <= 0.0031308 ) ? vLinearSegment.g : vExpSegment.g,

GUI/Types/Renderer/Shaders/post_processing.frag

@@ -72,16 +72,20 @@ vec3 DitherColor(vec3 vColor)
 
 vec4 SampleColorBuffer(vec2 coords)
 {
-    const int NumSamples = g_nNumSamplesMSAA;
-    vec4 colorSum = vec4(0.0);
+    const int NumSamples = int(g_nNumSamplesMSAA);
+    const float InvNumSamples = 1.0 / float(g_nNumSamplesMSAA);
+
+    vec4 vColorMSAA = vec4(0.0);
 
     for (int i = 0; i < NumSamples; i++)
     {
         vec4 sampleColor = texelFetch(g_tColorBuffer, ivec2(coords.xy), i);
-        colorSum += sampleColor.rgba;
+        sampleColor = clamp(sampleColor, vec4(0), vec4(65504));
+
+        vColorMSAA += sampleColor.rgba * InvNumSamples;
     }
 
-    return colorSum / float(NumSamples);
+    return vColorMSAA;
 }
 
 void main()
@@ -99,7 +103,7 @@ void main()
     }
 
     // Not present in CS2, done in msaa_resolve_ps instead
-    //vColor.rgb = DitherColor(vColor.rgb);
+    vColor.rgb = DitherColor(vColor.rgb);
 
     outputColor = vColor;
 }