forked from bartvdbraak/blender
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.
This commit is contained in:
parent
6cfb67b549
commit
334416bdaf
@ -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})
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user