[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44376] trunk/blender/intern/cycles/kernel : Cycles: fix cuda kernel not getting rebuilt correctly after changes, due to

[Brecht Van Lommel]

Revision: 44376
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44376
Author:   blendix
Date:     2012-02-23 15:10:10 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Cycles: fix cuda kernel not getting rebuilt correctly after changes, due to
refactoring that changed variable names, also fixed OpenCL compile issue with
advanced shading.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/CMakeLists.txt
    trunk/blender/intern/cycles/kernel/kernel_types.h

Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt	2012-02-23 14:24:45 UTC (rev 44375)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt	2012-02-23 15:10:10 UTC (rev 44376)
@@ -104,7 +104,7 @@
 		set(CUDA_BITS 32)
 	endif()
 
-	set(cuda_sources kernel.cu ${headers} ${svm_headers})
+	set(cuda_sources kernel.cu ${SRC_HEADERS} ${SRC_SVM_HEADERS} ${SRC_UTIL_HEADERS})
 	set(cuda_cubins)
 
 	foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2012-02-23 14:24:45 UTC (rev 44375)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2012-02-23 15:10:10 UTC (rev 44376)
@@ -181,7 +181,7 @@
 
 typedef float3 PathThroughput;
 
-struct PathRadiance {
+typedef struct PathRadiance {
 	int use_light_pass;
 
 	float3 emission;
@@ -202,16 +202,16 @@
 	float3 indirect_diffuse;
 	float3 indirect_glossy;
 	float3 indirect_transmission;
-};
+} PathRadiance;
 
-struct BsdfEval {
+typedef struct BsdfEval {
 	int use_light_pass;
 
 	float3 diffuse;
 	float3 glossy;
 	float3 transmission;
 	float3 transparent;
-};
+} BsdfEval;
 
 #else