lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 17:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement proper accurate sRGB conversion, instead of pow(2.2) approx

Browse Source
This commit is contained in:
baldurk
2016-07-19 17:33:27 +02:00
parent 36700ec4ab
commit eece61fe0b
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/data/glsl/texdisplay.frag
+9 -1
View File
@@ -25,6 +25,14 @@
layout (location = 0) out vec4 color_out;
float ConvertSRGBToLinear(float srgb)
{
if (srgb <= 0.04045f)
return srgb / 12.92f;
else
return pow(( clamp(srgb, 0.0f, 1.0f) + 0.055f) / 1.055f, 2.4f);
}
void main(void)
{
#if UINT_TEX
@@ -162,7 +170,7 @@ void main(void)
if((OutputDisplayFormat & TEXDISPLAY_GAMMA_CURVE) > 0)
{
col.rgb = pow(clamp(col.rgb, 0.0f.xxx, 1.0f.xxx), 2.2f.xxx);
col.rgb = vec3(ConvertSRGBToLinear(col.r), ConvertSRGBToLinear(col.g), ConvertSRGBToLinear(col.b));
}
color_out = col;
renderdoc/data/hlsl/debugdisplay.hlsl
+9 -1
View File
@@ -57,6 +57,14 @@ v2f RENDERDOC_DebugVS(uint vertID : SV_VertexID)
return OUT;
}
float ConvertSRGBToLinear(float srgb)
{
if (srgb <= 0.04045f)
return srgb / 12.92f;
else
return pow(saturate(srgb + 0.055f) / 1.055f, 2.4f);
}
// main texture display shader, used for the texture viewer. It samples the right resource
// for the type and applies things like the range check and channel masking.
// It also does a couple of overlays that we can get 'free' like NaN/inf checks
@@ -169,7 +177,7 @@ float4 RENDERDOC_TexDisplayPS(v2f IN) : SV_Target0
if(OutputDisplayFormat & TEXDISPLAY_GAMMA_CURVE)
{
col.rgb = pow(saturate(col.rgb), 2.2f);
col.rgb = float3(ConvertSRGBToLinear(col.r), ConvertSRGBToLinear(col.g), ConvertSRGBToLinear(col.b));
}
return col;
renderdoc/data/spv/texdisplay.frag
+9 -1
View File
@@ -26,6 +26,14 @@ layout (location = 0) out vec4 color_out;
//#include "texsample.h" // while includes aren't supported in glslang, this will be added in code
float ConvertSRGBToLinear(float srgb)
{
if (srgb <= 0.04045f)
return srgb / 12.92f;
else
return pow(( clamp(srgb, 0.0f, 1.0f) + 0.055f) / 1.055f, 2.4f);
}
void main(void)
{
bool uintTex = (texdisplay.OutputDisplayFormat & TEXDISPLAY_UINT_TEX) != 0;
@@ -166,7 +174,7 @@ void main(void)
if((texdisplay.OutputDisplayFormat & TEXDISPLAY_GAMMA_CURVE) > 0)
{
col.rgb = pow(clamp(col.rgb, 0.0f.xxx, 1.0f.xxx), 2.2f.xxx);
col.rgb = vec3(ConvertSRGBToLinear(col.r), ConvertSRGBToLinear(col.g), ConvertSRGBToLinear(col.b));
}
color_out = col;