diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-05-27 21:22:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-05-27 21:22:12 +0300 |
| commit | 712b0496c17c442a046cb76db7823d19e50a3892 (patch) | |
| tree | 2af81e406ce498c62c4e2062fa7d29280b5fef3e /intern/cycles/util | |
| parent | 7b65086fdf9cd4e70a6acceff1947e7bd3aa5613 (diff) | |
| parent | 967f96ee2e2ed454034f3e6be53fc7259f9016d0 (diff) | |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/half.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/util/half.h b/intern/cycles/util/half.h index 59ed652b346..434bc12d670 100644 --- a/intern/cycles/util/half.h +++ b/intern/cycles/util/half.h @@ -74,9 +74,9 @@ struct half4 { ccl_device_inline half float_to_half_image(float f) { #if defined(__KERNEL_METAL__) - return half(f); + return half(min(f, 65504.0f)); #elif defined(__KERNEL_CUDA__) || defined(__KERNEL_HIP__) - return __float2half(f); + return __float2half(min(f, 65504.0f)); #else const uint u = __float_as_uint(f); /* Sign bit, shifted to its position. */ @@ -137,9 +137,9 @@ ccl_device_inline float4 half4_to_float4_image(const half4 h) ccl_device_inline half float_to_half_display(const float f) { #if defined(__KERNEL_METAL__) - return half(f); + return half(min(f, 65504.0f)); #elif defined(__KERNEL_CUDA__) || defined(__KERNEL_HIP__) - return __float2half(f); + return __float2half(min(f, 65504.0f)); #else const int x = __float_as_int((f > 0.0f) ? ((f < 65504.0f) ? f : 65504.0f) : 0.0f); const int absolute = x & 0x7FFFFFFF; |