Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Constant fold for the Gamma Node.

Browse Source
This commit is contained in:
Thomas Dinges
2015-12-22 13:53:13 +01:00
parent ba82981a2f
commit 377b52be2e
4 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/kernel/svm/svm_gamma.h
View File

@@ -21,12 +21,7 @@ ccl_device void svm_node_gamma(ShaderData *sd, float *stack, uint in_gamma, uint
float3 color = stack_load_float3(stack, in_color);
float gamma = stack_load_float(stack, in_gamma);
if(color.x > 0.0f)
color.x = powf(color.x, gamma);
if(color.y > 0.0f)
color.y = powf(color.y, gamma);
if(color.z > 0.0f)
color.z = powf(color.z, gamma);
color = svm_math_gamma_color(color, gamma);
if(stack_valid(out_color))
stack_store_float3(stack, out_color, color);

12
intern/cycles/kernel/svm/svm_math_util.h
View File

@@ -166,5 +166,17 @@ ccl_device float3 svm_math_blackbody_color(float t) {
return make_float3(4.70366907f, 0.0f, 0.0f);
}
ccl_device_inline float3 svm_math_gamma_color(float3 color, float gamma)
{
if(color.x > 0.0f)
color.x = powf(color.x, gamma);
if(color.y > 0.0f)
color.y = powf(color.y, gamma);
if(color.z > 0.0f)
color.z = powf(color.z, gamma);
return color;
}
CCL_NAMESPACE_END