Skip to content

Commit 8974b77

Browse files
committed
[hdr] removed white point, this is an old school way of defining paper white on screen, we'll use real physics to determine it while tonemapping
1 parent ee007e3 commit 8974b77

File tree

6 files changed

+4
-13
lines changed

6 files changed

+4
-13
lines changed

data/shaders/common_resources.hlsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ struct FrameBufferData
5858
float camera_last_movement_time;
5959
float hdr_enabled;
6060
float hdr_max_nits;
61-
float hdr_white_point; // future me: not used, can be removed
61+
float padding;
6262

6363
float3 camera_position_previous;
6464
float resolution_scale;
6565

6666
double time;
6767
float camera_fov;
68-
float padding;
68+
float padding2;
6969

7070
float3 wind;
7171
float gamma;

source/editor/Widgets/RenderOptions.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -320,11 +320,6 @@ void RenderOptions::OnTickVisible()
320320
option_value("Gamma", Renderer_Option::Gamma);
321321
ImGui::EndDisabled();
322322
option_value("Exposure adaptation speed", Renderer_Option::AutoExposureAdaptationSpeed, "Negative value disables adaptation");
323-
324-
bool hdr_enabled = Renderer::GetOption<bool>(Renderer_Option::Hdr);
325-
ImGui::BeginDisabled(!hdr_enabled);
326-
option_value("White point (nits)", Renderer_Option::WhitePoint, "Target luminance of peak white", 1.0f);
327-
ImGui::EndDisabled();
328323
}
329324

330325
if (option("Tone Mapping"))

source/runtime/Core/Settings.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ namespace spartan
6767
case Renderer_Option::FilmGrain: return "FilmGrain";
6868
case Renderer_Option::ChromaticAberration: return "ChromaticAberration";
6969
case Renderer_Option::Anisotropy: return "Anisotropy";
70-
case Renderer_Option::WhitePoint: return "WhitePoint";
7170
case Renderer_Option::Tonemapping: return "Tonemapping";
7271
case Renderer_Option::AntiAliasing_Upsampling: return "AntiAliasing_Upsampling";
7372
case Renderer_Option::Sharpness: return "Sharpness";

source/runtime/Rendering/Renderer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ namespace spartan
137137
bool low_quality = RHI_Device::GetPrimaryPhysicalDevice()->IsBelowMinimumRequirements();
138138

139139
m_options.clear();
140-
SetOption(Renderer_Option::WhitePoint, 350.0f);
141140
SetOption(Renderer_Option::Tonemapping, static_cast<float>(Renderer_Tonemapping::Max));
142141
SetOption(Renderer_Option::Bloom, 1.0f); // non-zero values activate it and control the intensity
143142
SetOption(Renderer_Option::MotionBlur, 1.0f);
@@ -576,7 +575,6 @@ namespace spartan
576575
m_cb_frame_cpu.resolution_scale = GetOption<float>(Renderer_Option::ResolutionScale);
577576
m_cb_frame_cpu.hdr_enabled = GetOption<bool>(Renderer_Option::Hdr) ? 1.0f : 0.0f;
578577
m_cb_frame_cpu.hdr_max_nits = Display::GetLuminanceMax();
579-
m_cb_frame_cpu.hdr_white_point = GetOption<float>(Renderer_Option::WhitePoint);
580578
m_cb_frame_cpu.gamma = GetOption<float>(Renderer_Option::Gamma);
581579
m_cb_frame_cpu.camera_exposure = World::GetCamera() ? World::GetCamera()->GetExposure() : 1.0f;
582580

source/runtime/Rendering/Renderer_Buffers.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ namespace spartan
6666
float camera_last_movement_time;
6767
float hdr_enabled;
6868
float hdr_max_nits;
69-
float hdr_white_point;
69+
float padding;
7070

7171
math::Vector3 camera_position_previous;
7272
float resolution_scale;
7373

7474
double time;
7575
float camera_fov;
76-
float padding;
76+
float padding2;
7777

7878
math::Vector3 wind;
7979
float gamma;

source/runtime/Rendering/Renderer_Definitions.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ namespace spartan
5959
Sharpness,
6060
Dithering,
6161
Hdr,
62-
WhitePoint,
6362
Gamma,
6463
Vsync,
6564
VariableRateShading,

0 commit comments

Comments
 (0)