[Bf-blender-cvs] [91a9cd0a940] master: ClangFormat: manually format sobol.cpp

Campbell Barton noreply at git.blender.org
Wed Apr 17 06:37:46 CEST 2019


Commit: 91a9cd0a94000047248598394c41ac30f893f147
Author: Campbell Barton
Date:   Wed Apr 17 06:34:20 2019 +0200
Branches: master
https://developer.blender.org/rB91a9cd0a94000047248598394c41ac30f893f147

ClangFormat: manually format sobol.cpp

Disabled because it uses a lot of memory and is mostly data.

===================================================================

M	intern/cycles/render/sobol.cpp

===================================================================

diff --git a/intern/cycles/render/sobol.cpp b/intern/cycles/render/sobol.cpp
index 487599476d4..5fb3531b03b 100644
--- a/intern/cycles/render/sobol.cpp
+++ b/intern/cycles/render/sobol.cpp
@@ -54,8 +54,8 @@ CCL_NAMESPACE_BEGIN
 #define SOBOL_MAX_NUMBER 32
 
 typedef struct SobolDirectionNumbers {
-	uint d, s, a;
-	uint m[SOBOL_MAX_NUMBER];
+  uint d, s, a;
+  uint m[SOBOL_MAX_NUMBER];
 } SobolDirectionNumbers;
 
 /* Note: this file is skipped by clang-format. */
@@ -21268,40 +21268,40 @@ static SobolDirectionNumbers SOBOL_NUMBERS[SOBOL_MAX_DIMENSIONS - 1] = {
 
 void sobol_generate_direction_vectors(uint vectors[][SOBOL_BITS], int dimensions)
 {
-	assert(dimensions <= SOBOL_MAX_DIMENSIONS);
+  assert(dimensions <= SOBOL_MAX_DIMENSIONS);
 
-	const uint L = SOBOL_BITS;
+  const uint L = SOBOL_BITS;
 
-	/* first dimension is exception */
-	uint *v = vectors[0];
+  /* first dimension is exception */
+  uint *v = vectors[0];
 
-	for(uint i = 0; i < L; i++)
-		v[i] = 1 << (31-i); // all m's = 1
+  for (uint i = 0; i < L; i++)
+    v[i] = 1 << (31 - i);  // all m's = 1
 
-	for(int dim = 1; dim < dimensions; dim++) {
-		SobolDirectionNumbers *numbers = &SOBOL_NUMBERS[dim-1];
-		uint s = numbers->s;
-		uint a = numbers->a;
-		uint *m = numbers->m;
+  for (int dim = 1; dim < dimensions; dim++) {
+    SobolDirectionNumbers *numbers = &SOBOL_NUMBERS[dim - 1];
+    uint s = numbers->s;
+    uint a = numbers->a;
+    uint *m = numbers->m;
 
-		v = vectors[dim];
+    v = vectors[dim];
 
-		if(L <= s) {
-			for(uint i = 0; i < L; i++)
-				v[i] = m[i] << (31-i);
-		}
-		else {
-			for(uint i = 0; i < s; i++)
-				v[i] = m[i] << (31-i);
+    if (L <= s) {
+      for (uint i = 0; i < L; i++)
+        v[i] = m[i] << (31 - i);
+    }
+    else {
+      for (uint i = 0; i < s; i++)
+        v[i] = m[i] << (31 - i);
 
-			for(uint i = s; i < L; i++) {
-				v[i] = v[i-s] ^ (v[i-s] >> s);
+      for (uint i = s; i < L; i++) {
+        v[i] = v[i - s] ^ (v[i - s] >> s);
 
-				for(uint k = 1; k < s; k++)
-					v[i] ^= (((a >> (s-1-k)) & 1) * v[i-k]);
-			}
-		}
-	}
+        for (uint k = 1; k < s; k++)
+          v[i] ^= (((a >> (s - 1 - k)) & 1) * v[i - k]);
+      }
+    }
+  }
 }
 
 CCL_NAMESPACE_END



More information about the Bf-blender-cvs mailing list