blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Warnings

This commit is contained in:
Campbell Barton 2014-07-28 20:41:37 +10:00
parent baa58c7db4
commit 93d0a2c224
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/pbvh.c
View File

@ -51,10 +51,12 @@
#define STACK_FIXED_DEPTH 100
/* Setting zero so we can catch bugs in OpenMP/PBVH. */
#ifdef DEBUG
# define PBVH_OMP_LIMIT 0
#else
# define PBVH_OMP_LIMIT 8
#ifdef _OPENMP
# ifdef DEBUG
# define PBVH_OMP_LIMIT 0
# else
# define PBVH_OMP_LIMIT 8
# endif
#endif
typedef struct PBVHStack {

14
source/blender/blenlib/intern/BLI_kdopbvh.c
View File

@ -48,10 +48,12 @@
/* Setting zero so we can catch bugs in OpenMP/KDOPBVH.
* TODO(sergey): Deduplicate the limits with PBVH from BKE.
*/
#ifdef DEBUG
# define KDOPBVH_OMP_LIMIT 0
#else
# define KDOPBVH_OMP_LIMIT 1024
#ifdef _OPENMP
# ifdef DEBUG
# define KDOPBVH_OMP_LIMIT 0
# else
# define KDOPBVH_OMP_LIMIT 1024
# endif
#endif
typedef unsigned char axis_t;
@ -759,7 +761,7 @@ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array,
/* Loop all branches on this level */
//#pragma omp parallel for private(j) schedule(static) if (num_leafs > KDOPBVH_OMP_LIMIT)
#pragma omp parallel for private(j) schedule(static) if (num_leafs > KDOPBVH_OMP_LIMIT)
for (j = i; j < end_j; j++) {
int k;
const int parent_level_index = j - i;
@ -1112,7 +1114,7 @@ BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, unsigned int
data[j]->stop_axis = min_axis(tree1->stop_axis, tree2->stop_axis);
}
//#pragma omp parallel for private(j) schedule(static) if (tree1->totleaf > KDOPBVH_OMP_LIMIT)
#pragma omp parallel for private(j) schedule(static) if (tree1->totleaf > KDOPBVH_OMP_LIMIT)
for (j = 0; j < MIN2(tree1->tree_type, tree1->nodes[tree1->totleaf]->totnode); j++) {
traverse(data[j], tree1->nodes[tree1->totleaf]->children[j], tree2->nodes[tree2->totleaf]);
}

2
source/blender/makesrna/intern/rna_internal.h
View File

@ -414,7 +414,7 @@ void rna_RenderPass_rect_set(PointerRNA *ptr, const float *values);
#endif
/* C11 for compile time range checks */
#if __STDC_VERSION__ >= 201112L
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
# define USE_RNA_RANGE_CHECK
# define TYPEOF_MAX(x) \
_Generic(x, \