[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56600] trunk/blender/intern/cycles: Cycles / Hair rendering:

[Thomas Dinges]

Revision: 56600
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56600
Author:   dingto
Date:     2013-05-08 17:33:25 +0000 (Wed, 08 May 2013)
Log Message:
-----------
Cycles / Hair rendering:
* Enable hair rendering on the GPU.

Patch by Stuart Broadfoot, with small tweaks by me, to only enable it on sm_20 and above. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/intern/cycles/blender/blender_mesh.cpp
    trunk/blender/intern/cycles/kernel/kernel_types.h
    trunk/blender/intern/cycles/util/util_transform.h

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2013-05-08 17:23:56 UTC (rev 56599)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2013-05-08 17:33:25 UTC (rev 56600)
@@ -1032,8 +1032,7 @@
         scene = context.scene
         cscene = scene.cycles
         psys = context.particle_system
-        device_type = context.user_preferences.system.compute_device_type
-        experimental = ((cscene.feature_set == 'EXPERIMENTAL') and (cscene.device == 'CPU' or device_type == 'NONE'))
+        experimental = (cscene.feature_set == 'EXPERIMENTAL')
         return CyclesButtonsPanel.poll(context) and experimental and psys
 
     def draw_header(self, context):
@@ -1102,8 +1101,7 @@
         cscene = scene.cycles
         ccscene = scene.cycles_curves
         use_curves = ccscene.use_curves and context.particle_system
-        device_type = context.user_preferences.system.compute_device_type
-        experimental = cscene.feature_set == 'EXPERIMENTAL' and (cscene.device == 'CPU' or device_type == 'NONE')
+        experimental = cscene.feature_set == 'EXPERIMENTAL'
         return CyclesButtonsPanel.poll(context) and experimental and use_curves
 
     def draw(self, context):

Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp	2013-05-08 17:23:56 UTC (rev 56599)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp	2013-05-08 17:33:25 UTC (rev 56600)
@@ -449,14 +449,14 @@
 	mesh->name = ustring(b_ob_data.name().c_str());
 
 	if(b_mesh) {
-		if(!(hide_tris && experimental && is_cpu)) {
+		if(!(hide_tris && experimental)) {
 			if(cmesh.data && experimental && RNA_boolean_get(&cmesh, "use_subdivision"))
 				create_subd_mesh(mesh, b_mesh, &cmesh, used_shaders);
 			else
 				create_mesh(scene, mesh, b_mesh, used_shaders);
 		}
 
-		if(experimental && is_cpu)
+		if(experimental)
 			sync_curves(mesh, b_mesh, b_ob, object_updated);
 
 		/* free derived mesh */

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2013-05-08 17:23:56 UTC (rev 56599)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2013-05-08 17:33:25 UTC (rev 56600)
@@ -51,7 +51,6 @@
 #define __KERNEL_SHADING__
 #define __KERNEL_ADV_SHADING__
 #define __NON_PROGRESSIVE__
-#define __HAIR__
 #ifdef WITH_OSL
 #define __OSL__
 #endif
@@ -125,6 +124,7 @@
 #define __ANISOTROPIC__
 #define __CAMERA_MOTION__
 #define __OBJECT_MOTION__
+#define __HAIR__
 #endif
 //#define __SOBOL_FULL_SCREEN__
 

Modified: trunk/blender/intern/cycles/util/util_transform.h
===================================================================
--- trunk/blender/intern/cycles/util/util_transform.h	2013-05-08 17:23:56 UTC (rev 56599)
+++ trunk/blender/intern/cycles/util/util_transform.h	2013-05-08 17:33:25 UTC (rev 56600)
@@ -97,17 +97,6 @@
 	return make_float3(dot(x, a), dot(y, a), dot(z, a));
 }
 
-#ifndef __KERNEL_GPU__
-
-__device_inline void print_transform(const char *label, const Transform& t)
-{
-	print_float4(label, t.x);
-	print_float4(label, t.y);
-	print_float4(label, t.z);
-	print_float4(label, t.w);
-	printf("\n");
-}
-
 __device_inline Transform transform_transpose(const Transform a)
 {
 	Transform t;
@@ -148,6 +137,17 @@
 	return t;
 }
 
+#ifndef __KERNEL_GPU__
+
+__device_inline void print_transform(const char *label, const Transform& t)
+{
+	print_float4(label, t.x);
+	print_float4(label, t.y);
+	print_float4(label, t.z);
+	print_float4(label, t.w);
+	printf("\n");
+}
+
 __device_inline Transform transform_translate(float3 t)
 {
 	return make_transform(