diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-23 19:10:10 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-23 19:10:10 +0400 |
commit | 334416bdaf6b3fd4c61606fdcacf1509f03088f7 (patch) | |
tree | 55f9a488045e7bbd6c6b864b32b639cfd4bf1b49 | |
parent | 6cfb67b549f7fff4d446e79e78e83b755345c2ef (diff) |
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.
-rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 59fe9709e61..bef5c7af789 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -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}) diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 00635282202..9f4d5b00e2c 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -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 |