sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: fix cuda kernel not getting rebuilt correctly after changes, due to

Browse Source 
refactoring that changed variable names, also fixed OpenCL compile issue with
advanced shading.
This commit is contained in:
Brecht Van Lommel 2012-02-23 15:10:10 +00:00
parent 6cfb67b549
commit 334416bdaf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/CMakeLists.txt
View File

@ -104,7 +104,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
set(CUDA_BITS 32) set(CUDA_BITS 32)
endif() 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) set(cuda_cubins)
foreach(arch ${CYCLES_CUDA_BINARIES_ARCH}) foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})

8
intern/cycles/kernel/kernel_types.h
View File

@ -181,7 +181,7 @@ typedef enum PassType {
typedef float3 PathThroughput; typedef float3 PathThroughput;
struct PathRadiance { typedef struct PathRadiance {
int use_light_pass; int use_light_pass;
float3 emission; float3 emission;
@ -202,16 +202,16 @@ struct PathRadiance {
float3 indirect_diffuse; float3 indirect_diffuse;
float3 indirect_glossy; float3 indirect_glossy;
float3 indirect_transmission; float3 indirect_transmission;
}; } PathRadiance;
struct BsdfEval { typedef struct BsdfEval {
int use_light_pass; int use_light_pass;
float3 diffuse; float3 diffuse;
float3 glossy; float3 glossy;
float3 transmission; float3 transmission;
float3 transparent; float3 transparent;
}; } BsdfEval;
#else #else