kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

CLeanup: clang-format

Browse Source
This commit is contained in:
Campbell Barton 2020-02-11 18:45:08 +11:00
parent 452674db30
commit baa4b5e93c
7 changed files with 137 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/geom/geom_curve.h
View File

@ -83,7 +83,7 @@ ccl_device float curve_attribute_float(
return (1.0f - sd->u) * f0 + sd->u * f1; return (1.0f - sd->u) * f0 + sd->u * f1;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
# ifdef __RAY_DIFFERENTIALS__ # ifdef __RAY_DIFFERENTIALS__
if (dx) if (dx)
*dx = 0.0f; *dx = 0.0f;
@ -143,7 +143,7 @@ ccl_device float2 curve_attribute_float2(KernelGlobals *kg,
return (1.0f - sd->u) * f0 + sd->u * f1; return (1.0f - sd->u) * f0 + sd->u * f1;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
# ifdef __RAY_DIFFERENTIALS__ # ifdef __RAY_DIFFERENTIALS__
if (dx) if (dx)
*dx = make_float2(0.0f, 0.0f); *dx = make_float2(0.0f, 0.0f);
@ -203,7 +203,7 @@ ccl_device float3 curve_attribute_float3(KernelGlobals *kg,
return (1.0f - sd->u) * f0 + sd->u * f1; return (1.0f - sd->u) * f0 + sd->u * f1;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
# ifdef __RAY_DIFFERENTIALS__ # ifdef __RAY_DIFFERENTIALS__
if (dx) if (dx)
*dx = make_float3(0.0f, 0.0f, 0.0f); *dx = make_float3(0.0f, 0.0f, 0.0f);

8
intern/cycles/kernel/geom/geom_subd_triangle.h
View File

@ -217,7 +217,7 @@ ccl_device_noinline float subd_triangle_attribute_float(
return sd->u * a + sd->v * b + (1.0f - sd->u - sd->v) * c; return sd->u * a + sd->v * b + (1.0f - sd->u - sd->v) * c;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
if (dx) if (dx)
*dx = 0.0f; *dx = 0.0f;
if (dy) if (dy)
@ -360,7 +360,7 @@ ccl_device_noinline float2 subd_triangle_attribute_float2(KernelGlobals *kg,
return sd->u * a + sd->v * b + (1.0f - sd->u - sd->v) * c; return sd->u * a + sd->v * b + (1.0f - sd->u - sd->v) * c;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
if (dx) if (dx)
*dx = make_float2(0.0f, 0.0f); *dx = make_float2(0.0f, 0.0f);
if (dy) if (dy)
@ -502,7 +502,7 @@ ccl_device_noinline float3 subd_triangle_attribute_float3(KernelGlobals *kg,
return sd->u * a + sd->v * b + (1.0f - sd->u - sd->v) * c; return sd->u * a + sd->v * b + (1.0f - sd->u - sd->v) * c;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
if (dx) if (dx)
*dx = make_float3(0.0f, 0.0f, 0.0f); *dx = make_float3(0.0f, 0.0f, 0.0f);
if (dy) if (dy)
@ -608,7 +608,7 @@ ccl_device_noinline float4 subd_triangle_attribute_float4(KernelGlobals *kg,
return sd->u * a + sd->v * b + (1.0f - sd->u - sd->v) * c; return sd->u * a + sd->v * b + (1.0f - sd->u - sd->v) * c;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
if (dx) if (dx)
*dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f); *dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
if (dy) if (dy)

8
intern/cycles/kernel/geom/geom_triangle.h
View File

@ -153,7 +153,7 @@ ccl_device float triangle_attribute_float(
return sd->u * f0 + sd->v * f1 + (1.0f - sd->u - sd->v) * f2; return sd->u * f0 + sd->v * f1 + (1.0f - sd->u - sd->v) * f2;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
if (dx) if (dx)
*dx = 0.0f; *dx = 0.0f;
if (dy) if (dy)
@ -220,7 +220,7 @@ ccl_device float2 triangle_attribute_float2(KernelGlobals *kg,
return sd->u * f0 + sd->v * f1 + (1.0f - sd->u - sd->v) * f2; return sd->u * f0 + sd->v * f1 + (1.0f - sd->u - sd->v) * f2;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
if (dx) if (dx)
*dx = make_float2(0.0f, 0.0f); *dx = make_float2(0.0f, 0.0f);
if (dy) if (dy)
@ -288,7 +288,7 @@ ccl_device float3 triangle_attribute_float3(KernelGlobals *kg,
return sd->u * f0 + sd->v * f1 + (1.0f - sd->u - sd->v) * f2; return sd->u * f0 + sd->v * f1 + (1.0f - sd->u - sd->v) * f2;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
if (dx) if (dx)
*dx = make_float3(0.0f, 0.0f, 0.0f); *dx = make_float3(0.0f, 0.0f, 0.0f);
if (dy) if (dy)
@ -328,7 +328,7 @@ ccl_device float4 triangle_attribute_float4(KernelGlobals *kg,
return sd->u * f0 + sd->v * f1 + (1.0f - sd->u - sd->v) * f2; return sd->u * f0 + sd->v * f1 + (1.0f - sd->u - sd->v) * f2;
} }
else if(desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) {
if (dx) if (dx)
*dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f); *dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
if (dy) if (dy)

1
intern/cycles/test/util_avxf_avx2_test.cpp
View File

@ -19,4 +19,3 @@
#if defined(i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64) #if defined(i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
# include "util_avxf_test.h" # include "util_avxf_test.h"
#endif #endif

35
intern/cycles/test/util_avxf_test.h
View File

@ -62,14 +62,14 @@ const avxf avxf_b(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f);
const avxf avxf_c(1.1f, 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f); const avxf avxf_c(1.1f, 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f);
const float float_b = 1.5f; const float float_b = 1.5f;
TEST(util_avx, avxf_add_vv){basic_test_vv(avxf_a, avxf_b, +)} TEST(util_avx, avxf_add_vv){basic_test_vv(avxf_a, avxf_b, +)} TEST(util_avx, avxf_sub_vv){
TEST(util_avx, avxf_sub_vv){basic_test_vv(avxf_a, avxf_b, -)} basic_test_vv(avxf_a, avxf_b, -)} TEST(util_avx, avxf_mul_vv){
TEST(util_avx, avxf_mul_vv){basic_test_vv(avxf_a, avxf_b, *)} basic_test_vv(avxf_a, avxf_b, *)} TEST(util_avx, avxf_div_vv){
TEST(util_avx, avxf_div_vv){basic_test_vv(avxf_a, avxf_b, /)} basic_test_vv(avxf_a, avxf_b, /)} TEST(util_avx, avxf_add_vf){
TEST(util_avx, avxf_add_vf){basic_test_vf(avxf_a, float_b, +)} basic_test_vf(avxf_a, float_b, +)} TEST(util_avx, avxf_sub_vf){
TEST(util_avx, avxf_sub_vf){basic_test_vf(avxf_a, float_b, -)} basic_test_vf(avxf_a, float_b, -)} TEST(util_avx, avxf_mul_vf){
TEST(util_avx, avxf_mul_vf){basic_test_vf(avxf_a, float_b, *)} basic_test_vf(avxf_a, float_b, *)} TEST(util_avx,
TEST(util_avx, avxf_div_vf){basic_test_vf(avxf_a, float_b, /)} avxf_div_vf){basic_test_vf(avxf_a, float_b, /)}
TEST(util_avx, avxf_ctor) TEST(util_avx, avxf_ctor)
{ {
@ -77,8 +77,7 @@ TEST(util_avx, avxf_ctor)
compare_vector_scalar(avxf(7.0f, 6.0f, 5.0f, 4.0f, 3.0f, 2.0f, 1.0f, 0.0f), compare_vector_scalar(avxf(7.0f, 6.0f, 5.0f, 4.0f, 3.0f, 2.0f, 1.0f, 0.0f),
static_cast<float>(index)); static_cast<float>(index));
compare_vector_scalar(avxf(1.0f), 1.0f); compare_vector_scalar(avxf(1.0f), 1.0f);
compare_vector_vector(avxf(1.0f, 2.0f), compare_vector_vector(avxf(1.0f, 2.0f), avxf(1.0f, 1.0f, 1.0f, 1.0f, 2.0f, 2.0f, 2.0f, 2.0f));
avxf(1.0f, 1.0f, 1.0f, 1.0f, 2.0f, 2.0f, 2.0f, 2.0f));
compare_vector_vector(avxf(1.0f, 2.0f, 3.0f, 4.0f), compare_vector_vector(avxf(1.0f, 2.0f, 3.0f, 4.0f),
avxf(1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f)); avxf(1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f));
compare_vector_vector(avxf(make_float3(1.0f, 2.0f, 3.0f)), compare_vector_vector(avxf(make_float3(1.0f, 2.0f, 3.0f)),
@ -88,9 +87,7 @@ TEST(util_avx, avxf_ctor)
TEST(util_avx, avxf_sqrt) TEST(util_avx, avxf_sqrt)
{ {
VALIDATECPU VALIDATECPU
compare_vector_vector( compare_vector_vector(mm256_sqrt(avxf(1.0f, 4.0f, 9.0f, 16.0f, 25.0f, 36.0f, 49.0f, 64.0f)),
mm256_sqrt(
avxf(1.0f, 4.0f, 9.0f, 16.0f, 25.0f, 36.0f, 49.0f, 64.0f)),
avxf(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f)); avxf(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f));
} }
@ -105,8 +102,7 @@ TEST(util_avx, avxf_set_sign)
{ {
VALIDATECPU VALIDATECPU
avxf res = set_sign_bit<1, 0, 0, 0, 0, 0, 0, 0>(avxf_a); avxf res = set_sign_bit<1, 0, 0, 0, 0, 0, 0, 0>(avxf_a);
compare_vector_vector( compare_vector_vector(res, avxf(0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, -0.8f));
res, avxf(0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, -0.8f));
} }
TEST(util_avx, avxf_msub) TEST(util_avx, avxf_msub)
@ -177,24 +173,21 @@ TEST(util_avx, avxf_permute)
{ {
VALIDATECPU VALIDATECPU
avxf res = permute<3, 0, 1, 7, 6, 5, 2, 4>(avxf_b); avxf res = permute<3, 0, 1, 7, 6, 5, 2, 4>(avxf_b);
compare_vector_vector(res, compare_vector_vector(res, avxf(4.0f, 6.0f, 3.0f, 2.0f, 1.0f, 7.0f, 8.0f, 5.0f));
avxf(4.0f, 6.0f, 3.0f, 2.0f, 1.0f, 7.0f, 8.0f, 5.0f));
} }
TEST(util_avx, avxf_blend) TEST(util_avx, avxf_blend)
{ {
VALIDATECPU VALIDATECPU
avxf res = blend<0, 0, 1, 0, 1, 0, 1, 0>(avxf_a, avxf_b); avxf res = blend<0, 0, 1, 0, 1, 0, 1, 0>(avxf_a, avxf_b);
compare_vector_vector(res, compare_vector_vector(res, avxf(0.1f, 0.2f, 3.0f, 0.4f, 5.0f, 0.6f, 7.0f, 0.8f));
avxf(0.1f, 0.2f, 3.0f, 0.4f, 5.0f, 0.6f, 7.0f, 0.8f));
} }
TEST(util_avx, avxf_shuffle) TEST(util_avx, avxf_shuffle)
{ {
VALIDATECPU VALIDATECPU
avxf res = shuffle<0, 1, 2, 3, 1, 3, 2, 0>(avxf_a); avxf res = shuffle<0, 1, 2, 3, 1, 3, 2, 0>(avxf_a);
compare_vector_vector(res, compare_vector_vector(res, avxf(0.4f, 0.2f, 0.1f, 0.3f, 0.5f, 0.6f, 0.7f, 0.8f));
avxf(0.4f, 0.2f, 0.1f, 0.3f, 0.5f, 0.6f, 0.7f, 0.8f));
} }
/* XXX Test Fails on AVX2, needs further investigation before it can be enabled */ /* XXX Test Fails on AVX2, needs further investigation before it can be enabled */