diff options
| author | Michael <michael64> | 2021-12-17 16:39:20 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-12-17 16:46:52 +0300 |
| commit | 67734d18539743494152428e1c1c105f2ee2fd29 (patch) | |
| tree | e64398832a7d43bb8118c0f779fe300550fa2230 /intern/cycles/kernel/geom | |
| parent | f3c1d0e3a3b80bdeeb917500bd4f0bcce396adda (diff) | |
Fix T94142, T94182: Cycles metal broken after pointcloud changes
Missing ccl_private form an older patch.
Differential Revision: https://developer.blender.org/D13612
Diffstat (limited to 'intern/cycles/kernel/geom')
| -rw-r--r-- | intern/cycles/kernel/geom/point.h | 21 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/point_intersect.h | 4 |
2 files changed, 17 insertions, 8 deletions
diff --git a/intern/cycles/kernel/geom/point.h b/intern/cycles/kernel/geom/point.h index 021135b76fb..6d46b934f09 100644 --- a/intern/cycles/kernel/geom/point.h +++ b/intern/cycles/kernel/geom/point.h @@ -46,8 +46,11 @@ ccl_device float point_attribute_float(KernelGlobals kg, } } -ccl_device float2 point_attribute_float2( - KernelGlobals kg, const ShaderData *sd, const AttributeDescriptor desc, float2 *dx, float2 *dy) +ccl_device float2 point_attribute_float2(KernelGlobals kg, + ccl_private const ShaderData *sd, + const AttributeDescriptor desc, + ccl_private float2 *dx, + ccl_private float2 *dy) { # ifdef __RAY_DIFFERENTIALS__ if (dx) @@ -64,8 +67,11 @@ ccl_device float2 point_attribute_float2( } } -ccl_device float3 point_attribute_float3( - KernelGlobals kg, const ShaderData *sd, const AttributeDescriptor desc, float3 *dx, float3 *dy) +ccl_device float3 point_attribute_float3(KernelGlobals kg, + ccl_private const ShaderData *sd, + const AttributeDescriptor desc, + ccl_private float3 *dx, + ccl_private float3 *dy) { # ifdef __RAY_DIFFERENTIALS__ if (dx) @@ -82,8 +88,11 @@ ccl_device float3 point_attribute_float3( } } -ccl_device float4 point_attribute_float4( - KernelGlobals kg, const ShaderData *sd, const AttributeDescriptor desc, float4 *dx, float4 *dy) +ccl_device float4 point_attribute_float4(KernelGlobals kg, + ccl_private const ShaderData *sd, + const AttributeDescriptor desc, + ccl_private float4 *dx, + ccl_private float4 *dy) { # ifdef __RAY_DIFFERENTIALS__ if (dx) diff --git a/intern/cycles/kernel/geom/point_intersect.h b/intern/cycles/kernel/geom/point_intersect.h index 24afa33c53a..7abb0453ae5 100644 --- a/intern/cycles/kernel/geom/point_intersect.h +++ b/intern/cycles/kernel/geom/point_intersect.h @@ -23,7 +23,7 @@ CCL_NAMESPACE_BEGIN #ifdef __POINTCLOUD__ ccl_device_forceinline bool point_intersect_test( - const float4 point, const float3 P, const float3 dir, const float tmax, float *t) + const float4 point, const float3 P, const float3 dir, const float tmax, ccl_private float *t) { const float3 center = float4_to_float3(point); const float radius = point.w; @@ -93,7 +93,7 @@ ccl_device_forceinline bool point_intersect(KernelGlobals kg, ccl_device_inline void point_shader_setup(KernelGlobals kg, ccl_private ShaderData *sd, ccl_private const Intersection *isect, - const Ray *ray) + ccl_private const Ray *ray) { sd->shader = kernel_tex_fetch(__points_shader, isect->prim); sd->P = ray->P + ray->D * isect->t; |