ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup: Cycles: Fix building without some kernel features for debugging

Browse source 
Pull Request: https://projects.blender.org/blender/blender/pulls/151307
This commit is contained in:
Brecht Van Lommel 2025-12-08 14:09:26 +01:00 • committed by Brecht Van Lommel
parent 9dc7029801
commit 4ae19df885
9 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
intern/cycles/kernel/bvh/bvh.h
View file

@ -201,7 +201,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals kg,
/* Transparent shadow BVH traversal, recording multiple intersections. */
# ifdef __SHADOW_RECORD_ALL__
# ifdef __TRANSPARENT_SHADOWS__
# define BVH_FUNCTION_NAME bvh_intersect_shadow_all
# define BVH_FUNCTION_FEATURES BVH_POINTCLOUD
@ -279,7 +279,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals kg,
kernel_assert(false);
return false;
}
# endif /* __SHADOW_RECORD_ALL__ */
# endif /* __TRANSPARENT_SHADOWS__ */
/* Volume BVH traversal, for initializing or updating the volume stack. */

2
intern/cycles/kernel/device/cpu/bvh.h
View file

@ -691,7 +691,7 @@ ccl_device_intersect bool kernel_embree_intersect_local(KernelGlobals kg,
}
#endif
#ifdef __SHADOW_RECORD_ALL__
#ifdef __TRANSPARENT_SHADOWS__
ccl_device_intersect bool kernel_embree_intersect_shadow_all(KernelGlobals kg,
IntegratorShadowState state,
const ccl_private Ray *ray,

4
intern/cycles/kernel/device/hiprt/bvh.h
View file

@ -161,7 +161,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals kg,
}
#endif /*__BVH_LOCAL__ */
#ifdef __SHADOW_RECORD_ALL__
#ifdef __TRANSPARENT_SHADOWS__
ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals kg,
IntegratorShadowState state,
const ccl_private Ray *ray,
@ -198,7 +198,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals kg,
const hiprtHit hit = traversal.getNextHit();
return hit.hasHit();
}
#endif /* __SHADOW_RECORD_ALL__ */
#endif /* __TRANSPARENT_SHADOWS__ */
#ifdef __VOLUME__
ccl_device_intersect bool scene_intersect_volume(KernelGlobals kg,

2
intern/cycles/kernel/device/metal/bvh.h
View file

@ -476,7 +476,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals kg,
}
#endif
#ifdef __SHADOW_RECORD_ALL__
#ifdef __TRANSPARENT_SHADOWS__
ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals kg,
IntegratorShadowState state,
const ccl_private Ray *ray,

4
intern/cycles/kernel/device/metal/kernel.metal
View file

@ -197,7 +197,7 @@ bool metalrt_shadow_all_hit(
return true;
}
# ifdef __SHADOW_RECORD_ALL__
# ifdef __TRANSPARENT_SHADOWS__
float u = barycentrics.x;
float v = barycentrics.y;
const int prim_type = kernel_data_fetch(objects, object).primitive_type;
@ -337,7 +337,7 @@ bool metalrt_shadow_all_hit(
/* Continue tracing. */
# endif /* __TRANSPARENT_SHADOWS__ */
# endif /* __SHADOW_RECORD_ALL__ */
# endif /* __TRANSPARENT_SHADOWS__ */
return true;
}

6
intern/cycles/kernel/device/optix/bvh.h
View file

@ -142,7 +142,7 @@ extern "C" __global__ void __anyhit__kernel_optix_local_hit()
extern "C" __global__ void __anyhit__kernel_optix_shadow_all_hit()
{
#ifdef __SHADOW_RECORD_ALL__
#ifdef __TRANSPARENT_SHADOWS__
int prim = optixGetPrimitiveIndex();
const uint object = get_object_id();
# ifdef __VISIBILITY_FLAG__
@ -273,7 +273,7 @@ extern "C" __global__ void __anyhit__kernel_optix_shadow_all_hit()
/* Continue tracing. */
optixIgnoreIntersection();
# endif /* __TRANSPARENT_SHADOWS__ */
#endif /* __SHADOW_RECORD_ALL__ */
#endif /* __TRANSPARENT_SHADOWS__ */
}
extern "C" __global__ void __anyhit__kernel_optix_volume_test()
@ -611,7 +611,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals kg,
}
#endif
#ifdef __SHADOW_RECORD_ALL__
#ifdef __TRANSPARENT_SHADOWS__
ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals kg,
IntegratorShadowState state,
const ccl_private Ray *ray,

4
intern/cycles/kernel/integrator/shade_volume.h
View file

@ -25,8 +25,6 @@
CCL_NAMESPACE_BEGIN
#ifdef __VOLUME__
/* Events for probabilistic scattering. */
enum VolumeIntegrateEvent {
@ -35,6 +33,8 @@ enum VolumeIntegrateEvent {
VOLUME_PATH_MISSED = 2
};
#ifdef __VOLUME__
struct VolumeIntegrateResult {
/* Throughput and offset for direct light scattering. */
bool direct_scatter;

2
intern/cycles/kernel/svm/closure.h
View file

@ -482,8 +482,6 @@ ccl_device
sd->flag |= bssrdf_setup(sd, bssrdf, path_flag, subsurface_method);
}
}
#else
(void)data_subsurf;
#endif
ccl_private OrenNayarBsdf *bsdf = (ccl_private OrenNayarBsdf *)bsdf_alloc(

2
intern/cycles/kernel/types.h
View file

@ -182,7 +182,6 @@ CCL_NAMESPACE_BEGIN
#define __RAY_DIFFERENTIALS__
#define __SHADER_RAYTRACE__
#define __SHADOW_CATCHER__
#define __SHADOW_RECORD_ALL__
#define __SUBSURFACE__
#define __SVM__
#define __TRANSPARENT_SHADOWS__
@ -225,7 +224,6 @@ CCL_NAMESPACE_BEGIN
# undef __VOLUME__
# if !(__KERNEL_FEATURES__ & KERNEL_FEATURE_TRANSPARENT)
# undef __TRANSPARENT_SHADOWS__
# undef __SHADOW_RECORD_ALL__
# endif
# endif
# if !(__KERNEL_FEATURES__ & KERNEL_FEATURE_SUBSURFACE)