diff options
| author | Campbell Barton <campbell@blender.org> | 2022-05-05 10:32:57 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-05-05 10:33:43 +0300 |
| commit | eb837ba17eb5bc53de98972ab1f0b9aa30658e19 (patch) | |
| tree | 4cd67ec9ef1aa00f0e4a3bb0622e1730df00c41e /intern | |
| parent | 6513ce258f734f50fa152a8f88240368e176389b (diff) | |
Cleanup: format
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/osl/shaders/node_combine_color.osl | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/shaders/node_separate_color.osl | 8 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/sepcomb_color.h | 23 | ||||
| -rw-r--r-- | intern/cycles/util/color.h | 3 |
4 files changed, 23 insertions, 17 deletions
diff --git a/intern/cycles/kernel/osl/shaders/node_combine_color.osl b/intern/cycles/kernel/osl/shaders/node_combine_color.osl index 94d624d82ad..681a592d2bb 100644 --- a/intern/cycles/kernel/osl/shaders/node_combine_color.osl +++ b/intern/cycles/kernel/osl/shaders/node_combine_color.osl @@ -3,7 +3,11 @@ #include "stdcycles.h" -shader node_combine_color(string color_type = "rgb", float Red = 0.0, float Green = 0.0, float Blue = 0.0, output color Color = 0.8) +shader node_combine_color(string color_type = "rgb", + float Red = 0.0, + float Green = 0.0, + float Blue = 0.0, + output color Color = 0.8) { if (color_type == "rgb" || color_type == "hsv" || color_type == "hsl") Color = color(color_type, Red, Green, Blue); diff --git a/intern/cycles/kernel/osl/shaders/node_separate_color.osl b/intern/cycles/kernel/osl/shaders/node_separate_color.osl index cba2d85da05..6f3e3149d8e 100644 --- a/intern/cycles/kernel/osl/shaders/node_separate_color.osl +++ b/intern/cycles/kernel/osl/shaders/node_separate_color.osl @@ -5,10 +5,10 @@ #include "stdcycles.h" shader node_separate_color(string color_type = "rgb", - color Color = 0.8, - output float Red = 0.0, - output float Green = 0.0, - output float Blue = 0.0) + color Color = 0.8, + output float Red = 0.0, + output float Green = 0.0, + output float Blue = 0.0) { color col; if (color_type == "rgb") diff --git a/intern/cycles/kernel/svm/sepcomb_color.h b/intern/cycles/kernel/svm/sepcomb_color.h index a1a8cdfd9b0..d186e7f163b 100644 --- a/intern/cycles/kernel/svm/sepcomb_color.h +++ b/intern/cycles/kernel/svm/sepcomb_color.h @@ -6,14 +6,15 @@ CCL_NAMESPACE_BEGIN ccl_device_noinline void svm_node_combine_color(KernelGlobals kg, - ccl_private ShaderData *sd, - ccl_private float *stack, - uint color_type, - uint inputs_stack_offsets, - uint result_stack_offset) + ccl_private ShaderData *sd, + ccl_private float *stack, + uint color_type, + uint inputs_stack_offsets, + uint result_stack_offset) { uint red_stack_offset, green_stack_offset, blue_stack_offset; - svm_unpack_node_uchar3(inputs_stack_offsets, &red_stack_offset, &green_stack_offset, &blue_stack_offset); + svm_unpack_node_uchar3( + inputs_stack_offsets, &red_stack_offset, &green_stack_offset, &blue_stack_offset); float r = stack_load_float(stack, red_stack_offset); float g = stack_load_float(stack, green_stack_offset); @@ -27,11 +28,11 @@ ccl_device_noinline void svm_node_combine_color(KernelGlobals kg, } ccl_device_noinline void svm_node_separate_color(KernelGlobals kg, - ccl_private ShaderData *sd, - ccl_private float *stack, - uint color_type, - uint input_stack_offset, - uint results_stack_offsets) + ccl_private ShaderData *sd, + ccl_private float *stack, + uint color_type, + uint input_stack_offset, + uint results_stack_offsets) { float3 color = stack_load_float3(stack, input_stack_offset); diff --git a/intern/cycles/util/color.h b/intern/cycles/util/color.h index a390b49cf7b..795c3754976 100644 --- a/intern/cycles/util/color.h +++ b/intern/cycles/util/color.h @@ -162,7 +162,8 @@ ccl_device float3 rgb_to_hsl(float3 rgb) if (cmax == cmin) { h = s = 0.0f; /* achromatic */ - } else { + } + else { float cdelta = cmax - cmin; s = l > 0.5f ? cdelta / (2.0f - cmax - cmin) : cdelta / (cmax + cmin); if (cmax == rgb.x) { |