griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Workbench: Linear => srgb conversion

Browse Source
This commit is contained in:
Jeroen Bakker
2018-05-02 17:37:11 +02:00
parent 3fa6b6ed4c
commit f0d67d8f6a
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl
View File

@@ -33,3 +33,20 @@ vec2 normal_encode(vec3 n)
float p = sqrt(n.z * 8.0 + 8.0);
return vec2(n.xy / p + 0.5);
}
/* Linear to srgb conversion */
const float SRGB_ALPHA = 0.055;
float linear_to_srgb(float channel) {
if(channel <= 0.0031308) {
return 12.92 * channel;
} else {
return (1.0 + SRGB_ALPHA) * pow(channel, 1.0/2.4) - SRGB_ALPHA;
}
}
vec3 linearrgb_to_srgb(vec3 rgb) {
return vec3(
linear_to_srgb(rgb.r),
linear_to_srgb(rgb.g),
linear_to_srgb(rgb.b)
);
}

8
source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
View File

@@ -22,7 +22,7 @@ void main()
#ifndef V3D_DRAWOPTION_OBJECT_OVERLAP
if (depth == 1.0) {
fragColor = vec4(background_color(world_data, uv_viewport.y), 0.0);
fragColor = vec4(linearrgb_to_srgb(background_color(world_data, uv_viewport.y)), 0.0);
return;
}
#else /* !V3D_DRAWOPTION_OBJECT_OVERLAP */
@@ -32,9 +32,9 @@ void main()
if (object_id == NO_OBJECT_ID) {
vec3 background = background_color(world_data, uv_viewport.y);
if (object_overlap == 0.0) {
fragColor = vec4(background, 0.0);
fragColor = vec4(linearrgb_to_srgb(background), 0.0);
} else {
fragColor = vec4(mix(objectOverlapColor, background, object_overlap), 1.0-object_overlap);
fragColor = vec4(linearrgb_to_srgb(mix(objectOverlapColor, background, object_overlap)), 1.0-object_overlap);
}
return;
}
@@ -64,5 +64,5 @@ void main()
shaded_color = mix(objectOverlapColor, shaded_color, object_overlap);
#endif /* V3D_DRAWOPTION_OBJECT_OVERLAP */
fragColor = vec4(shaded_color, 1.0);
fragColor = vec4(linearrgb_to_srgb(shaded_color), 1.0);
}