[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49872] branches/soc-2011-tomato/intern/ cycles/blender: Tomato Cycles: revert some changes of r49835

[Sergey Sharybin]

Revision: 49872
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49872
Author:   nazgul
Date:     2012-08-13 14:51:39 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
Tomato Cycles: revert some changes of r49835

Apparently for viewport rendering on GPU tile size of 1024 gives
much better performance than using single tile. Not sure why it
doesn't work for background rendering, need to be investigated
further.

Meanwhile use old debug value of 1024 for tile size.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49835

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
    branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py	2012-08-13 11:01:27 UTC (rev 49871)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py	2012-08-13 14:51:39 UTC (rev 49872)
@@ -235,6 +235,13 @@
                 default=0.0,
                 )
 
+        cls.debug_tile_size = IntProperty(
+                name="Tile Size",
+                description="",
+                min=1, max=4096,
+                default=1024,
+                )
+
         cls.resolution_divider = IntProperty(
                 name="Resolution Divider",
                 description="Start viewport rendering with lower resolution which would be real resolution divided by two in power of this value",

Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp	2012-08-13 11:01:27 UTC (rev 49871)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp	2012-08-13 14:51:39 UTC (rev 49872)
@@ -344,10 +344,24 @@
 	}
 
 	/* tiles */
-	int tile_x = b_engine.tile_x();
-	int tile_y = b_engine.tile_y();
+	if(params.device.type != DEVICE_CPU && !background) {
+		printf("%d\n", get_int(cscene, "debug_tile_size"));
 
-	params.tile_size = make_int2(tile_x, tile_y);
+		/* currently GPU could be much slower than CPU when using tiles,
+		 * still need to be investigated, but meanwhile make it possible
+		 * to work in viewport smoothly
+		 */
+		int debug_tile_size = get_int(cscene, "debug_tile_size");
+
+		params.tile_size = make_int2(debug_tile_size, debug_tile_size);
+	}
+	else {
+		int tile_x = b_engine.tile_x();
+		int tile_y = b_engine.tile_y();
+
+		params.tile_size = make_int2(tile_x, tile_y);
+	}
+
 	params.resolution = 1 << get_int(cscene, "resolution_divider");
 
 	/* other parameters */