diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-08-15 14:53:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-08-15 14:53:42 +0300 |
| commit | 3aeacb9ab35bd5ff4786076917f56862b7ab1716 (patch) | |
| tree | e185c18a383ec702559adf23e0363f5a3685fb46 /intern | |
| parent | 12e5b92c9c3815a21769b322b6ef54d473ce185f (diff) | |
| parent | 8c77fa558a20728ee748824a3fbbabe964aefab5 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/device/metal/kernel.metal | 2 | ||||
| -rw-r--r-- | intern/libc_compat/libc_compat.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/kernel/device/metal/kernel.metal b/intern/cycles/kernel/device/metal/kernel.metal index 3de8c069c30..5646c7446db 100644 --- a/intern/cycles/kernel/device/metal/kernel.metal +++ b/intern/cycles/kernel/device/metal/kernel.metal @@ -321,7 +321,7 @@ inline TReturnType metalrt_visibility_test( constant KernelParamsMetal &launch_params_metal, ray_data MetalKernelContext::MetalRTIntersectionPayload &payload, const uint object, - const uint prim, + uint prim, const float u) { TReturnType result; diff --git a/intern/libc_compat/libc_compat.c b/intern/libc_compat/libc_compat.c index 85a6b439893..5b969d80501 100644 --- a/intern/libc_compat/libc_compat.c +++ b/intern/libc_compat/libc_compat.c @@ -13,7 +13,8 @@ # include <features.h> # include <math.h> -# if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31) +# if defined(__GLIBC_PREREQ) +# if __GLIBC_PREREQ(2, 31) double __exp_finite(double x); double __exp2_finite(double x); @@ -112,5 +113,6 @@ float __powf_finite(float x, float y) return powf(x, y); } -# endif /* __GLIBC_PREREQ */ -#endif /* __linux__ */ +# endif /* __GLIBC_PREREQ(2, 31) */ +# endif /* __GLIBC_PREREQ */ +#endif /* __linux__ */ |