Cleaned up bloom shader unfirom orders.

Author: bryanedds

Nu/Nu.Gaia/Assets/Default/FilterBloomComposite.glsl

@@ -19,9 +19,9 @@ out vec4 FragColor;
 
 in vec2 TexCoords;
 
-uniform sampler2D scene;
-uniform sampler2D bloomBlur;
 uniform float bloomStrength = 0.04f;
+uniform sampler2D bloomBlur;
+uniform sampler2D scene;
 
 void main()
 {

Nu/Nu/OpenGL/OpenGL.Filter.fs

@@ -47,24 +47,22 @@ module Filter =
 
     /// Describes a bloom down-sampling filter shader that's loaded into GPU.
     type FilterBloomDownSampleShader =
-        { srcTextureUniform : int
-          srcResolutionUniform : int
+        { srcResolutionUniform : int
           mipLevelUniform : int
+          srcTextureUniform : int
           FilterBloomDownSampleShader : uint }
 
     /// Describes a bloom up-sampling filter shader that's loaded into GPU.
     type FilterBloomUpSampleShader =
-        { srcTextureUniform : int
-          filterRadiusUniform : int
+        { filterRadiusUniform : int
+          srcTextureUniform : int
           FilterBloomUpSampleShader : uint }
 
     /// Describes a bloom composite filter shader that's loaded into GPU.
     type FilterBloomCompositeShader =
-        { sceneUniform : int
+        { bloomStrengthUniform : int
           bloomBlurUniform : int
-          exposureUniform : int
-          bloomStrengthUniform : int
-          programChoiceUniform : int
+          sceneUniform : int
           FilterBloomCompositeShader : uint }
 
     /// Describes an fxaa shader that's loaded into GPU.
@@ -186,9 +184,9 @@ module Filter =
         let mipLevelUniform = Gl.GetUniformLocation (shader, "mipLevel")
 
         // make shader record
-        { srcTextureUniform = srcTextureUniform
-          srcResolutionUniform = srcResolutionUniform
+        { srcResolutionUniform = srcResolutionUniform
           mipLevelUniform = mipLevelUniform
+          srcTextureUniform = srcTextureUniform
           FilterBloomDownSampleShader = shader }
 
     /// Create a filter bloom up-sample shader.
@@ -203,8 +201,8 @@ module Filter =
         let filterRadiusUniform = Gl.GetUniformLocation (shader, "filterRadius")
 
         // make shader record
-        { srcTextureUniform = srcTextureUniform
-          filterRadiusUniform = filterRadiusUniform
+        { filterRadiusUniform = filterRadiusUniform
+          srcTextureUniform = srcTextureUniform
           FilterBloomUpSampleShader = shader }
 
     /// Create a filter bloom composite shader.
@@ -215,18 +213,14 @@ module Filter =
         Hl.Assert ()
 
         // retrieve uniforms
-        let sceneUniform = Gl.GetUniformLocation (shader, "scene")
-        let bloomBlurUniform = Gl.GetUniformLocation (shader, "bloomBlur")
-        let exposureUniform = Gl.GetUniformLocation (shader, "exposure")
         let bloomStrengthUniform = Gl.GetUniformLocation (shader, "bloomStrength")
-        let programChoiceUniform = Gl.GetUniformLocation (shader, "programChoice")
+        let bloomBlurUniform = Gl.GetUniformLocation (shader, "bloomBlur")
+        let sceneUniform = Gl.GetUniformLocation (shader, "scene")
 
         // make shader record
-        { sceneUniform = sceneUniform
+        { bloomStrengthUniform = bloomStrengthUniform
           bloomBlurUniform = bloomBlurUniform
-          exposureUniform = exposureUniform
-          bloomStrengthUniform = bloomStrengthUniform
-          programChoiceUniform = programChoiceUniform
+          sceneUniform = sceneUniform
           FilterBloomCompositeShader = shader }
 
     /// Create a filter fxaa shader.

Nu/Nu/OpenGL/OpenGL.PhysicallyBased.fs

@@ -3055,8 +3055,8 @@ module PhysicallyBased =
     /// Draw the bloom composite pass using a physically-based surface.
     let DrawBloomCompositeSurface
         (bloomStrength : single,
-         sceneTexture : Texture.Texture,
          bloomBlurTexture : Texture.Texture,
+         sceneTexture : Texture.Texture,
          geometry : PhysicallyBasedGeometry,
          shader : Filter.FilterBloomCompositeShader,
          vao : uint) =
@@ -3067,16 +3067,16 @@ module PhysicallyBased =
 
         // setup shader
         Gl.UseProgram shader.FilterBloomCompositeShader
-        Gl.Uniform1 (shader.sceneUniform, 0)
-        Gl.Uniform1 (shader.bloomBlurUniform, 1)
         Gl.Uniform1 (shader.bloomStrengthUniform, bloomStrength)
+        Gl.Uniform1 (shader.bloomBlurUniform, 0)
+        Gl.Uniform1 (shader.sceneUniform, 1)
         Hl.Assert ()
 
         // setup textures
         Gl.ActiveTexture TextureUnit.Texture0
-        Gl.BindTexture (TextureTarget.Texture2d, sceneTexture.TextureId)
-        Gl.ActiveTexture TextureUnit.Texture1
         Gl.BindTexture (TextureTarget.Texture2d, bloomBlurTexture.TextureId)
+        Gl.ActiveTexture TextureUnit.Texture1
+        Gl.BindTexture (TextureTarget.Texture2d, sceneTexture.TextureId)
         Hl.Assert ()
 
         // setup geometry

Nu/Nu/Render/Renderer3d.fs

@@ -4034,7 +4034,7 @@ type [<ReferenceEquality>] GlRenderer3d =
 
             // render bloom composite pass
             OpenGL.PhysicallyBased.DrawBloomCompositeSurface
-                (Constants.Render.BloomStrength, compositionTexture, bloomSampleTextures.[0],
+                (Constants.Render.BloomStrength, bloomSampleTextures.[0], compositionTexture,
                  renderer.PhysicallyBasedQuad, renderer.FilterShaders.FilterBloomCompositeShader, renderer.PhysicallyBasedStaticVao)
             OpenGL.Hl.Assert ()