Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /intern/cycles/kernel/kernel_film.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'intern/cycles/kernel/kernel_film.h')
-rw-r--r--intern/cycles/kernel/kernel_film.h92
1 files changed, 51 insertions, 41 deletions
diff --git a/intern/cycles/kernel/kernel_film.h b/intern/cycles/kernel/kernel_film.h
index b5f151d8663..d20f1adf663 100644
--- a/intern/cycles/kernel/kernel_film.h
+++ b/intern/cycles/kernel/kernel_film.h
@@ -18,72 +18,82 @@ CCL_NAMESPACE_BEGIN
ccl_device float4 film_map(KernelGlobals *kg, float4 irradiance, float scale)
{
- float exposure = kernel_data.film.exposure;
- float4 result = irradiance*scale;
+ float exposure = kernel_data.film.exposure;
+ float4 result = irradiance * scale;
- /* conversion to srgb */
- result.x = color_linear_to_srgb(result.x*exposure);
- result.y = color_linear_to_srgb(result.y*exposure);
- result.z = color_linear_to_srgb(result.z*exposure);
+ /* conversion to srgb */
+ result.x = color_linear_to_srgb(result.x * exposure);
+ result.y = color_linear_to_srgb(result.y * exposure);
+ result.z = color_linear_to_srgb(result.z * exposure);
- /* clamp since alpha might be > 1.0 due to russian roulette */
- result.w = saturate(result.w);
+ /* clamp since alpha might be > 1.0 due to russian roulette */
+ result.w = saturate(result.w);
- return result;
+ return result;
}
ccl_device uchar4 film_float_to_byte(float4 color)
{
- uchar4 result;
+ uchar4 result;
- /* simple float to byte conversion */
- result.x = (uchar)(saturate(color.x)*255.0f);
- result.y = (uchar)(saturate(color.y)*255.0f);
- result.z = (uchar)(saturate(color.z)*255.0f);
- result.w = (uchar)(saturate(color.w)*255.0f);
+ /* simple float to byte conversion */
+ result.x = (uchar)(saturate(color.x) * 255.0f);
+ result.y = (uchar)(saturate(color.y) * 255.0f);
+ result.z = (uchar)(saturate(color.z) * 255.0f);
+ result.w = (uchar)(saturate(color.w) * 255.0f);
- return result;
+ return result;
}
ccl_device void kernel_film_convert_to_byte(KernelGlobals *kg,
- ccl_global uchar4 *rgba, ccl_global float *buffer,
- float sample_scale, int x, int y, int offset, int stride)
+ ccl_global uchar4 *rgba,
+ ccl_global float *buffer,
+ float sample_scale,
+ int x,
+ int y,
+ int offset,
+ int stride)
{
- /* buffer offset */
- int index = offset + x + y*stride;
+ /* buffer offset */
+ int index = offset + x + y * stride;
- rgba += index;
- buffer += index*kernel_data.film.pass_stride;
+ rgba += index;
+ buffer += index * kernel_data.film.pass_stride;
- /* map colors */
- float4 irradiance = *((ccl_global float4*)buffer);
- float4 float_result = film_map(kg, irradiance, sample_scale);
- uchar4 byte_result = film_float_to_byte(float_result);
+ /* map colors */
+ float4 irradiance = *((ccl_global float4 *)buffer);
+ float4 float_result = film_map(kg, irradiance, sample_scale);
+ uchar4 byte_result = film_float_to_byte(float_result);
- *rgba = byte_result;
+ *rgba = byte_result;
}
ccl_device void kernel_film_convert_to_half_float(KernelGlobals *kg,
- ccl_global uchar4 *rgba, ccl_global float *buffer,
- float sample_scale, int x, int y, int offset, int stride)
+ ccl_global uchar4 *rgba,
+ ccl_global float *buffer,
+ float sample_scale,
+ int x,
+ int y,
+ int offset,
+ int stride)
{
- /* buffer offset */
- int index = offset + x + y*stride;
+ /* buffer offset */
+ int index = offset + x + y * stride;
- ccl_global float4 *in = (ccl_global float4*)(buffer + index*kernel_data.film.pass_stride);
- ccl_global half *out = (ccl_global half*)rgba + index*4;
+ ccl_global float4 *in = (ccl_global float4 *)(buffer + index * kernel_data.film.pass_stride);
+ ccl_global half *out = (ccl_global half *)rgba + index * 4;
- float exposure = kernel_data.film.exposure;
+ float exposure = kernel_data.film.exposure;
- float4 rgba_in = *in;
+ float4 rgba_in = *in;
- if(exposure != 1.0f) {
- rgba_in.x *= exposure;
- rgba_in.y *= exposure;
- rgba_in.z *= exposure;
- }
+ if (exposure != 1.0f) {
+ rgba_in.x *= exposure;
+ rgba_in.y *= exposure;
+ rgba_in.z *= exposure;
+ }
- float4_store_half(out, rgba_in, sample_scale);
+ float4_store_half(out, rgba_in, sample_scale);
}
CCL_NAMESPACE_END