Fix: Cycles: Compilation issue with WITH_CYCLES_DEBUG enabled

Pull Request: https://projects.blender.org/blender/blender/pulls/133303
This commit is contained in:
Weizhen Huang
2025-01-20 16:11:38 +01:00
committed by Weizhen Huang
parent 3ed2c2346d
commit f79cae2c59
3 changed files with 13 additions and 6 deletions

View File

@@ -7,6 +7,10 @@
#include "device/cpu/kernel.h" #include "device/cpu/kernel.h"
#include "device/device.h" #include "device/device.h"
#ifdef WITH_CYCLES_DEBUG
# include "kernel/film/write.h"
#endif
#include "kernel/integrator/path_state.h" #include "kernel/integrator/path_state.h"
#include "integrator/pass_accessor_cpu.h" #include "integrator/pass_accessor_cpu.h"
@@ -331,10 +335,10 @@ void PathTraceWorkCPU::guiding_init_kernel_globals(void *guiding_field,
} }
} }
void PathTraceWorkCPU::guiding_push_sample_data_to_global_storage( void PathTraceWorkCPU::guiding_push_sample_data_to_global_storage(ThreadKernelGlobalsCPU *kg,
ThreadKernelGlobalsCPU *kg, IntegratorStateCPU *state,
IntegratorStateCPU *state, ccl_global float *ccl_restrict
const ccl_global float *ccl_restrict render_buffer) render_buffer)
{ {
# ifdef WITH_CYCLES_DEBUG # ifdef WITH_CYCLES_DEBUG
if (VLOG_WORK_IS_ON) { if (VLOG_WORK_IS_ON) {

View File

@@ -65,8 +65,7 @@ class PathTraceWorkCPU : public PathTraceWork {
* This function is called at the end of a random walk/path generation. */ * This function is called at the end of a random walk/path generation. */
void guiding_push_sample_data_to_global_storage(ThreadKernelGlobalsCPU *kg, void guiding_push_sample_data_to_global_storage(ThreadKernelGlobalsCPU *kg,
IntegratorStateCPU *state, IntegratorStateCPU *state,
const ccl_global float *ccl_restrict ccl_global float *ccl_restrict render_buffer);
render_buffer);
#endif #endif
protected: protected:

View File

@@ -10,6 +10,10 @@
#include "kernel/integrator/state.h" #include "kernel/integrator/state.h"
#include "kernel/util/colorspace.h" #include "kernel/util/colorspace.h"
#ifdef WITH_CYCLES_DEBUG
# include "kernel/closure/bsdf.h"
#endif
#include "util/color.h" #include "util/color.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN