[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25936] trunk/blender/source/blender/ render/intern: Raytrace: only print debug info when running with -d option.
Brecht Van Lommel
brecht at blender.org
Tue Jan 12 20:45:01 CET 2010
Revision: 25936
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25936
Author: blendix
Date: 2010-01-12 20:45:01 +0100 (Tue, 12 Jan 2010)
Log Message:
-----------
Raytrace: only print debug info when running with -d option.
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/include/rayobject.h
trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
trunk/blender/source/blender/render/intern/raytrace/reorganize.h
trunk/blender/source/blender/render/intern/raytrace/svbvh.h
trunk/blender/source/blender/render/intern/source/rayshade.c
Modified: trunk/blender/source/blender/render/intern/include/rayobject.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/rayobject.h 2010-01-12 19:44:23 UTC (rev 25935)
+++ trunk/blender/source/blender/render/intern/include/rayobject.h 2010-01-12 19:45:01 UTC (rev 25936)
@@ -181,7 +181,7 @@
#include <time.h>
#define BENCH(a,name) \
- do { \
+ { \
double _t1, _t2; \
struct timeval _tstart, _tend; \
clock_t _clock_init = clock(); \
@@ -191,7 +191,7 @@
_t1 = ( double ) _tstart.tv_sec + ( double ) _tstart.tv_usec/ ( 1000*1000 ); \
_t2 = ( double ) _tend.tv_sec + ( double ) _tend.tv_usec/ ( 1000*1000 ); \
printf("BENCH:%s: %fs (real) %fs (cpu)\n", #name, _t2-_t1, (float)(clock()-_clock_init)/CLOCKS_PER_SEC);\
- } while(0)
+ }
#else
#define BENCH(a,name) (a)
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp 2010-01-12 19:44:23 UTC (rev 25935)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp 2010-01-12 19:45:01 UTC (rev 25936)
@@ -37,6 +37,7 @@
#include "RE_raytrace.h"
#include "BLI_memarena.h"
#include "MEM_guardedalloc.h"
+#include "BKE_global.h"
#include "BKE_utildefines.h"
#include "BLI_math.h"
@@ -145,10 +146,13 @@
{
if(tot_pushup + tot_pushdown + tot_hints + tot_moves)
{
- printf("tot pushups: %d\n", tot_pushup);
- printf("tot pushdowns: %d\n", tot_pushdown);
- printf("tot moves: %d\n", tot_moves);
- printf("tot hints created: %d\n", tot_hints);
+ if(G.f & G_DEBUG) {
+ printf("tot pushups: %d\n", tot_pushup);
+ printf("tot pushdowns: %d\n", tot_pushdown);
+ printf("tot moves: %d\n", tot_moves);
+ printf("tot hints created: %d\n", tot_hints);
+ }
+
tot_pushup = 0;
tot_pushdown = 0;
tot_hints = 0;
Modified: trunk/blender/source/blender/render/intern/raytrace/reorganize.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/reorganize.h 2010-01-12 19:44:23 UTC (rev 25935)
+++ trunk/blender/source/blender/render/intern/raytrace/reorganize.h 2010-01-12 19:45:01 UTC (rev 25936)
@@ -32,6 +32,8 @@
#include <vector>
#include <queue>
+#include "BKE_global.h"
+
#ifdef _WIN32
#define INFINITY FLT_MAX // in mingw math.h: (1.0F/0.0F). This generates compile error, though.
#endif
@@ -515,7 +517,7 @@
if(num == 0) { num++; first = true; }
calc_costs(node);
- if(first) printf("expected cost = %f (%d)\n", node->cut_cost[0], node->best_cutsize );
+ if((G.f & G_DEBUG) && first) printf("expected cost = %f (%d)\n", node->cut_cost[0], node->best_cutsize );
node->optimize();
}
return node;
Modified: trunk/blender/source/blender/render/intern/raytrace/svbvh.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2010-01-12 19:44:23 UTC (rev 25935)
+++ trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2010-01-12 19:45:01 UTC (rev 25936)
@@ -33,6 +33,7 @@
#include "bvh.h"
#include "BLI_memarena.h"
+#include "BKE_global.h"
#include <stdio.h>
#include <algorithm>
@@ -142,10 +143,12 @@
~Reorganize_SVBVH()
{
- printf("%f childs per node\n", childs_per_node / nodes);
- printf("%d childs BB are useless\n", useless_bb);
- for(int i=0; i<16; i++)
- printf("%i childs per node: %d/%d = %f\n", i, nodes_with_childs[i], nodes, nodes_with_childs[i]/float(nodes));
+ if(G.f & G_DEBUG) {
+ printf("%f childs per node\n", childs_per_node / nodes);
+ printf("%d childs BB are useless\n", useless_bb);
+ for(int i=0; i<16; i++)
+ printf("%i childs per node: %d/%d = %f\n", i, nodes_with_childs[i], nodes, nodes_with_childs[i]/float(nodes));
+ }
}
SVBVHNode *create_node(int nchilds)
Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c 2010-01-12 19:44:23 UTC (rev 25935)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c 2010-01-12 19:45:01 UTC (rev 25936)
@@ -435,7 +435,12 @@
if(re->r.raytrace_structure == R_RAYSTRUCTURE_OCTREE)
re->r.raytrace_options &= ~( R_RAYTRACE_USE_INSTANCES | R_RAYTRACE_USE_LOCAL_COORDS);
- BENCH(makeraytree_single(re), tree_build);
+ if(G.f & G_DEBUG) {
+ BENCH(makeraytree_single(re), tree_build);
+ }
+ else
+ makeraytree_single(re);
+
if(test_break(re))
{
freeraytree(re);
More information about the Bf-blender-cvs
mailing list