HDR: use constant exposure.

jpcy · Jul 7, 2016 · 717c950 · 717c950
1 parent e436b85
commit 717c950
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/code/renderer_bgfx/Main.cpp b/code/renderer_bgfx/Main.cpp
@@ -732,7 +732,7 @@ void Main::renderScene(const SceneDefinition &scene)
 					Clamped(g_cvars.saturation.getFloat(), 0.0f, 3.0f)
 				));
 
-				uniforms_->hdrKey.set(vec4(Clamped(g_cvars.hdrKey.getFloat(), 0.01f, 0.2f), 0, 0, 0));
+				uniforms_->hdrExposure.set(vec4(g_cvars.hdrExposure.getFloat(), 0, 0, 0));
 				bgfx::setTexture(0, uniforms_->textureSampler.handle, sceneFb_.handle, SceneFrameBufferAttachment::Color);
 				bgfx::setTexture(1, uniforms_->adaptedLuminanceSampler.handle, adaptedLuminanceFB_[currentAdaptedLuminanceFB_].handle);
 				renderScreenSpaceQuad(aa_ == AntiAliasing::None ? defaultFb_ : sceneTempFb_, ShaderProgramId::ToneMap, BGFX_STATE_RGB_WRITE, BGFX_CLEAR_NONE, isTextureOriginBottomLeft_);

diff --git a/code/renderer_bgfx/Main_init.cpp b/code/renderer_bgfx/Main_init.cpp
@@ -133,7 +133,7 @@ void ConsoleVariables::initialize()
 	dynamicLightIntensity = interface::Cvar_Get("r_dynamicLightIntensity", "1", ConsoleVariableFlags::Archive);
 	dynamicLightScale = interface::Cvar_Get("r_dynamicLightScale", "0.7", ConsoleVariableFlags::Archive);
 	hdr = interface::Cvar_Get("r_hdr", "0", ConsoleVariableFlags::Archive | ConsoleVariableFlags::Latch);
-	hdrKey = interface::Cvar_Get("r_hdrKey", "0.1", ConsoleVariableFlags::Archive);
+	hdrExposure = interface::Cvar_Get("r_hdrExposure", "0.7", ConsoleVariableFlags::Archive);
 	lerpTextureAnimation = interface::Cvar_Get("r_lerpTextureAnimation", "1", ConsoleVariableFlags::Archive | ConsoleVariableFlags::Latch);
 	maxAnisotropy = interface::Cvar_Get("r_maxAnisotropy", "0", ConsoleVariableFlags::Archive | ConsoleVariableFlags::Latch);
 	picmip = interface::Cvar_Get("r_picmip", "0", ConsoleVariableFlags::Archive | ConsoleVariableFlags::Latch);

diff --git a/code/renderer_bgfx/Precompiled.h b/code/renderer_bgfx/Precompiled.h
@@ -138,7 +138,7 @@ struct ConsoleVariables
 	ConsoleVariable dynamicLightIntensity;
 	ConsoleVariable dynamicLightScale;
 	ConsoleVariable hdr;
-	ConsoleVariable hdrKey;
+	ConsoleVariable hdrExposure;
 	ConsoleVariable lerpTextureAnimation;
 	ConsoleVariable maxAnisotropy;
 	ConsoleVariable picmip;
@@ -1388,7 +1388,7 @@ struct Uniforms
 	Uniform_vec4 brightnessContrastGammaSaturation = "u_BrightnessContrastGammaSaturation";
 
 	/// @remarks Only x used.
-	Uniform_vec4 hdrKey = "u_HdrKey";
+	Uniform_vec4 hdrExposure = "u_HdrExposure";
 	/// @}
 
 	/// @name Texture samplers

diff --git a/shaders/ToneMap_fragment.sc b/shaders/ToneMap_fragment.sc
@@ -12,7 +12,7 @@ uniform vec4 u_BrightnessContrastGammaSaturation;
 #define gamma u_BrightnessContrastGammaSaturation.z
 #define saturation u_BrightnessContrastGammaSaturation.w
 
-uniform vec4 u_HdrKey; // only x used
+uniform vec4 u_HdrExposure; // only x used
 
 // https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/
 vec3 ACESFilm(vec3 x)
@@ -30,8 +30,7 @@ void main()
 	vec3 color = texture2D(u_TextureSampler, v_texcoord0).rgb;
 
 	// tone map
-	color *= u_HdrKey.x / (texture2D(u_AdaptedLuminanceSampler, vec2_splat(0.0)).r + 0.001);
-	color = ACESFilm(color);
+	color = ACESFilm(color * u_HdrExposure.x);
 
 	// contrast and brightness
 	color = (color - 0.5) * contrast + 0.5 + brightness;