[Bf-blender-cvs] [baa4b5e93c0] master: CLeanup: clang-format
Campbell Barton
noreply at git.blender.org
Tue Feb 11 08:48:08 CET 2020
Commit: baa4b5e93c0dee956a7e2386d4b62a3adeea1a34
Author: Campbell Barton
Date: Tue Feb 11 18:45:08 2020 +1100
Branches: master
https://developer.blender.org/rBbaa4b5e93c0dee956a7e2386d4b62a3adeea1a34
CLeanup: clang-format
===================================================================
M intern/cycles/kernel/geom/geom_curve.h
M intern/cycles/kernel/geom/geom_subd_triangle.h
M intern/cycles/kernel/geom/geom_triangle.h
M intern/cycles/test/util_avxf_avx2_test.cpp
M intern/cycles/test/util_avxf_test.h
M source/blender/makesrna/intern/rna_access_compare_override.c
M source/blender/makesrna/intern/rna_rna.c
===================================================================
diff --git a/intern/cycles/kernel/geom/geom_curve.h b/intern/cycles/kernel/geom/geom_curve.h
index f2b8408b0e0..928cad58452 100644
--- a/intern/cycles/kernel/geom/geom_curve.h
+++ b/intern/cycles/kernel/geom/geom_curve.h
@@ -83,7 +83,7 @@ ccl_device float curve_attribute_float(
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__
if (dx)
*dx = 0.0f;
@@ -143,7 +143,7 @@ ccl_device float2 curve_attribute_float2(KernelGlobals *kg,
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__
if (dx)
*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;
}
- 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__
if (dx)
*dx = make_float3(0.0f, 0.0f, 0.0f);
diff --git a/intern/cycles/kernel/geom/geom_subd_triangle.h b/intern/cycles/kernel/geom/geom_subd_triangle.h
index 62a66cfa0e9..3eef9857ae3 100644
--- a/intern/cycles/kernel/geom/geom_subd_triangle.h
+++ b/intern/cycles/kernel/geom/geom_subd_triangle.h
@@ -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;
}
- 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)
*dx = 0.0f;
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;
}
- 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)
*dx = make_float2(0.0f, 0.0f);
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;
}
- 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)
*dx = make_float3(0.0f, 0.0f, 0.0f);
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;
}
- 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)
*dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
if (dy)
diff --git a/intern/cycles/kernel/geom/geom_triangle.h b/intern/cycles/kernel/geom/geom_triangle.h
index 072c02bf0d3..a2731bf2bd0 100644
--- a/intern/cycles/kernel/geom/geom_triangle.h
+++ b/intern/cycles/kernel/geom/geom_triangle.h
@@ -153,7 +153,7 @@ ccl_device float triangle_attribute_float(
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)
*dx = 0.0f;
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;
}
- 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)
*dx = make_float2(0.0f, 0.0f);
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;
}
- 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)
*dx = make_float3(0.0f, 0.0f, 0.0f);
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;
}
- 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)
*dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
if (dy)
diff --git a/intern/cycles/test/util_avxf_avx2_test.cpp b/intern/cycles/test/util_avxf_avx2_test.cpp
index f6917db3230..9b466ddd3a0 100644
--- a/intern/cycles/test/util_avxf_avx2_test.cpp
+++ b/intern/cycles/test/util_avxf_avx2_test.cpp
@@ -19,4 +19,3 @@
#if defined(i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
# include "util_avxf_test.h"
#endif
-
diff --git a/intern/cycles/test/util_avxf_test.h b/intern/cycles/test/util_avxf_test.h
index 91f5fe2070b..1dd677e35e6 100644
--- a/intern/cycles/test/util_avxf_test.h
+++ b/intern/cycles/test/util_avxf_test.h
@@ -24,177 +24,170 @@ bool validate_cpu_capabilities()
{
#ifdef __KERNEL_AVX2__
- return system_cpu_support_avx2();
+ return system_cpu_support_avx2();
#else
# ifdef __KERNEL_AVX__
- return system_cpu_support_avx();
+ return system_cpu_support_avx();
# endif
#endif
}
-#define VALIDATECPU \
- if (!validate_cpu_capabilities()) \
- return;
+#define VALIDATECPU \
+ if (!validate_cpu_capabilities()) \
+ return;
-#define compare_vector_scalar(a, b) \
- for (size_t index = 0; index < a.size; index++) \
- EXPECT_FLOAT_EQ(a[index], b);
+#define compare_vector_scalar(a, b) \
+ for (size_t index = 0; index < a.size; index++) \
+ EXPECT_FLOAT_EQ(a[index], b);
-#define compare_vector_vector(a, b) \
- for (size_t index = 0; index < a.size; index++) \
- EXPECT_FLOAT_EQ(a[index], b[index]);
+#define compare_vector_vector(a, b) \
+ for (size_t index = 0; index < a.size; index++) \
+ EXPECT_FLOAT_EQ(a[index], b[index]);
-#define basic_test_vv(a, b, op) \
- VALIDATECPU \
- avxf c = a op b; \
- for (size_t i = 0; i < a.size; i++) \
- EXPECT_FLOAT_EQ(c[i], a[i] op b[i]);
+#define basic_test_vv(a, b, op) \
+ VALIDATECPU \
+ avxf c = a op b; \
+ for (size_t i = 0; i < a.size; i++) \
+ EXPECT_FLOAT_EQ(c[i], a[i] op b[i]);
/* vector op float tests */
-#define basic_test_vf(a, b, op) \
- VALIDATECPU \
- avxf c = a op b; \
- for (size_t i = 0; i < a.size; i++) \
- EXPECT_FLOAT_EQ(c[i], a[i] op b);
+#define basic_test_vf(a, b, op) \
+ VALIDATECPU \
+ avxf c = a op b; \
+ for (size_t i = 0; i < a.size; i++) \
+ EXPECT_FLOAT_EQ(c[i], a[i] op b);
const avxf avxf_a(0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f);
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 float float_b = 1.5f;
-TEST(util_avx, avxf_add_vv){basic_test_vv(avxf_a, avxf_b, +)}
-TEST(util_avx, avxf_sub_vv){basic_test_vv(avxf_a, avxf_b, -)}
-TEST(util_avx, avxf_mul_vv){basic_test_vv(avxf_a, avxf_b, *)}
-TEST(util_avx, avxf_div_vv){basic_test_vv(avxf_a, avxf_b, /)}
-TEST(util_avx, avxf_add_vf){basic_test_vf(avxf_a, float_b, +)}
-TEST(util_avx, avxf_sub_vf){basic_test_vf(avxf_a, float_b, -)}
-TEST(util_avx, avxf_mul_vf){basic_test_vf(avxf_a, float_b, *)}
-TEST(util_avx, avxf_div_vf){basic_test_vf(avxf_a, float_b, /)}
+TEST(util_avx, avxf_add_vv){basic_test_vv(avxf_a, avxf_b, +)} TEST(util_avx, avxf_sub_vv){
+ basic_test_vv(avxf_a, avxf_b, -)} TEST(util_avx, avxf_mul_vv){
+ basic_test_vv(avxf_a, avxf_b, *)} TEST(util_avx, avxf_div_vv){
+ basic_test_vv(avxf_a, avxf_b, /)} TEST(util_avx, avxf_add_vf){
+ basic_test_vf(avxf_a, float_b, +)} TEST(util_avx, avxf_sub_vf){
+ basic_test_vf(avxf_a, float_b, -)} TEST(util_avx, avxf_mul_vf){
+ basic_test_vf(avxf_a, float_b, *)} TEST(util_avx,
+ avxf_div_vf){basic_test_vf(avxf_a, float_b, /)}
TEST(util_avx, avxf_ctor)
{
- VALIDATECPU
- compare_vector_scalar(avxf(7.0f, 6.0f, 5.0f, 4.0f, 3.0f, 2.0f, 1.0f, 0.0f),
- static_cast<float>(index));
- compare_vector_scalar(avxf(1.0f), 1.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));
- 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));
- compare_vector_vector(avxf(make_float3(1.0f, 2.0f, 3.0f)),
- avxf(0.0f, 3.0f, 2.0f, 1.0f, 0.0f, 3.0f, 2.0f, 1.0f));
+ VALIDATECPU
+ compare_vector_scalar(avxf(7.0f, 6.0f, 5.0f, 4.0f, 3.0f, 2.0f, 1.0f, 0.0f),
+ static_cast<float>(index));
+ compare_vector_scalar(avxf(1.0f), 1.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));
+ compare_vector_vector(avxf(1.0f, 2.0f, 3.0f, 4.0f),
+ avxf(1.0f, 2.0f,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list