Cycles: Header cleanup in BVH: move self header to be the first one

This makes us more sure that header files are more self-sufficient.

diff --git a/intern/cycles/bvh/bvh4.h b/intern/cycles/bvh/bvh4.h
index 1e1e8565ea1461e677378cfae2110bad76022da4..310909a37e11eff644114753bf472a40d6764635 100644 (file)
--- a/intern/cycles/bvh/bvh4.h
+++ b/intern/cycles/bvh/bvh4.h
@@ -84,5 +84,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH_H__ */
-
+#endif /* __BVH4_H__ */

diff --git a/intern/cycles/bvh/bvh_binning.cpp b/intern/cycles/bvh/bvh_binning.cpp
index 3226008f51110decbeeb8d6079c57b8b1d1b6cdb..63a7fc116680d8caa2c9040291213a12d6780f91 100644 (file)
--- a/intern/cycles/bvh/bvh_binning.cpp
+++ b/intern/cycles/bvh/bvh_binning.cpp
@@ -17,10 +17,10 @@
 
 //#define __KERNEL_SSE__
 
-#include <stdlib.h>
-
 #include "bvh/bvh_binning.h"
 
+#include <stdlib.h>
+
 #include "util/util_algorithm.h"
 #include "util/util_boundbox.h"
 #include "util/util_types.h"

diff --git a/intern/cycles/bvh/bvh_binning.h b/intern/cycles/bvh/bvh_binning.h
index 285f9c56a62a859cbb60b8c6265ba1832e848bc6..c2e259b169616194775021f73e2e7c8051acbc74 100644 (file)
--- a/intern/cycles/bvh/bvh_binning.h
+++ b/intern/cycles/bvh/bvh_binning.h
@@ -111,5 +111,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif
-
+#endif  /* __BVH_BINNING_H__ */

diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp
index 95c71b54da04e5c28ae87ed8a2b884897832da44..1880964355c15157986974ca17b9294477554edc 100644 (file)
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/bvh_build.cpp
@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_binning.h"
 #include "bvh/bvh_build.h"
+
+#include "bvh/bvh_binning.h"
 #include "bvh/bvh_node.h"
 #include "bvh/bvh_params.h"
 #include "bvh_split.h"

diff --git a/intern/cycles/bvh/bvh_build.h b/intern/cycles/bvh/bvh_build.h
index 5733708050dfd0fece38a56a57be27c97e660c66..7b2451398199eb2f6199a7cf7377c9a453cfd1f6 100644 (file)
--- a/intern/cycles/bvh/bvh_build.h
+++ b/intern/cycles/bvh/bvh_build.h
@@ -20,17 +20,17 @@
 
 #include <float.h>
 
-#include "bvh/bvh.h"
-#include "bvh/bvh_binning.h"
+#include "bvh/bvh_params.h"
 #include "bvh/bvh_unaligned.h"
 
-#include "util/util_boundbox.h"
 #include "util/util_task.h"
 #include "util/util_vector.h"
 
 CCL_NAMESPACE_BEGIN
 
+class Boundbox;
 class BVHBuildTask;
+class BVHNode;
 class BVHSpatialSplitBuildTask;
 class BVHParams;
 class InnerNode;

diff --git a/intern/cycles/bvh/bvh_node.cpp b/intern/cycles/bvh/bvh_node.cpp
index 4f788c667977e38932eedbd9a629c1f8a64c4b06..4237c62ab5b58b8e58de44bbe49da015dc024f12 100644 (file)
--- a/intern/cycles/bvh/bvh_node.cpp
+++ b/intern/cycles/bvh/bvh_node.cpp
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
+#include "bvh/bvh_node.h"
+
 #include "bvh/bvh.h"
 #include "bvh/bvh_build.h"
-#include "bvh/bvh_node.h"
 
 #include "util/util_debug.h"
 #include "util/util_vector.h"

diff --git a/intern/cycles/bvh/bvh_node.h b/intern/cycles/bvh/bvh_node.h
index 60511b4b0128d099c5d2d240d2ee268f72cc5198..1c875f5a52454de2d55d154f095d95a19b62096d 100644 (file)
--- a/intern/cycles/bvh/bvh_node.h
+++ b/intern/cycles/bvh/bvh_node.h
@@ -19,7 +19,6 @@
 #define __BVH_NODE_H__
 
 #include "util/util_boundbox.h"
-#include "util/util_debug.h"
 #include "util/util_types.h"
 
 CCL_NAMESPACE_BEGIN

diff --git a/intern/cycles/bvh/bvh_params.h b/intern/cycles/bvh/bvh_params.h
index 9795a7a43508a2139cc70a5e898d890f40b8ed8d..7dd699b33a42b8c9e536729d18737449f2ac39b4 100644 (file)
--- a/intern/cycles/bvh/bvh_params.h
+++ b/intern/cycles/bvh/bvh_params.h
@@ -246,4 +246,3 @@ struct BVHSpatialStorage {
 CCL_NAMESPACE_END
 
 #endif /* __BVH_PARAMS_H__ */
-

diff --git a/intern/cycles/bvh/bvh_sort.cpp b/intern/cycles/bvh/bvh_sort.cpp
index d29629c0279ba515aa034923788edb07aab3ba91..3a01061b28534558cba75ea97467497903901882 100644 (file)
--- a/intern/cycles/bvh/bvh_sort.cpp
+++ b/intern/cycles/bvh/bvh_sort.cpp
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_build.h"
 #include "bvh/bvh_sort.h"
 
+#include "bvh/bvh_build.h"
+
 #include "util/util_algorithm.h"
 #include "util/util_debug.h"
 #include "util/util_task.h"

diff --git a/intern/cycles/bvh/bvh_sort.h b/intern/cycles/bvh/bvh_sort.h
index b49ca02eb60ff58cbd8177372c3e557b9bf81f62..936401d8607b951c9ea01485d7ed680d80cfa905 100644 (file)
--- a/intern/cycles/bvh/bvh_sort.h
+++ b/intern/cycles/bvh/bvh_sort.h
@@ -18,8 +18,11 @@
 #ifndef __BVH_SORT_H__
 #define __BVH_SORT_H__
 
+#include <cstddef>
+
 CCL_NAMESPACE_BEGIN
 
+class BVHReference;
 class BVHUnaligned;
 struct Transform;
 
@@ -33,4 +36,3 @@ void bvh_reference_sort(int start,
 CCL_NAMESPACE_END
 
 #endif /* __BVH_SORT_H__ */
-

diff --git a/intern/cycles/bvh/bvh_split.cpp b/intern/cycles/bvh/bvh_split.cpp
index b10d69a495d3030c6518ed800388cd495b925ecb..c55ba40b5657fca593de0ddd09f6d16f753974a1 100644 (file)
--- a/intern/cycles/bvh/bvh_split.cpp
+++ b/intern/cycles/bvh/bvh_split.cpp
@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_build.h"
 #include "bvh/bvh_split.h"
+
+#include "bvh/bvh_build.h"
 #include "bvh/bvh_sort.h"
 
 #include "render/mesh.h"

diff --git a/intern/cycles/bvh/bvh_unaligned.cpp b/intern/cycles/bvh/bvh_unaligned.cpp
index ef227d20ea9ac9a005f61b69e58fcf69e049ec5d..b522a8f3e1061140c96823ade2d667aa4f5ce7fe 100644 (file)
--- a/intern/cycles/bvh/bvh_unaligned.cpp
+++ b/intern/cycles/bvh/bvh_unaligned.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 #include "bvh/bvh_unaligned.h"
 
 #include "render/mesh.h"

diff --git a/intern/cycles/bvh/bvh_unaligned.h b/intern/cycles/bvh/bvh_unaligned.h
index f41bae79e2b3bea31148b063b4c026bdac333f3f..c3ece051cd5a89081295463ad8f7d0a06373efcc 100644 (file)
--- a/intern/cycles/bvh/bvh_unaligned.h
+++ b/intern/cycles/bvh/bvh_unaligned.h
@@ -78,4 +78,3 @@ protected:
 CCL_NAMESPACE_END
 
 #endif /* __BVH_UNALIGNED_H__ */
-