Cycles: fix cuda kernel not getting rebuilt correctly after changes, due to
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 23 Feb 2012 15:10:10 +0000 (15:10 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 23 Feb 2012 15:10:10 +0000 (15:10 +0000)
refactoring that changed variable names, also fixed OpenCL compile issue with
advanced shading.

intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/kernel_types.h

index 59fe9709e61abb5e82b1941cdd36d11fddb1fc78..bef5c7af789ca01bf3ec3d789f05a066cd390ff9 100644 (file)
@@ -104,7 +104,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
                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})
index 006352822024cf6f00a9ba2602ed3fd0cc2999f5..9f4d5b00e2ca2e779c68952c252c03896b28a444 100644 (file)
@@ -181,7 +181,7 @@ typedef enum PassType {
 
 typedef float3 PathThroughput;
 
-struct PathRadiance {
+typedef struct PathRadiance {
        int use_light_pass;
 
        float3 emission;
@@ -202,16 +202,16 @@ struct PathRadiance {
        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