diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-11-17 20:46:21 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-11-17 21:56:18 +0300 |
commit | fa7a6d67a8084d6c26084d811ec959595aa92fdf (patch) | |
tree | b957b4c858cf1351c7b5c5d71b1b0ad62208f901 /intern | |
parent | d9bc8f189cc36cc55082cfd7ad8845e96eb062e3 (diff) |
Fix Cycles CUDA/HIP compiler error after recent changes
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 3 | ||||
-rw-r--r-- | intern/cycles/util/types_float3.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index baa0e9a73d8..e7a7d226bae 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -410,7 +410,8 @@ if(WITH_CYCLES_CUDA_BINARIES) -I ${CMAKE_CURRENT_SOURCE_DIR}/.. -I ${CMAKE_CURRENT_SOURCE_DIR}/device/cuda --use_fast_math - -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_file}) + -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_file} + -Wno-deprecated-gpu-targets) if(WITH_NANOVDB) set(cuda_flags ${cuda_flags} diff --git a/intern/cycles/util/types_float3.h b/intern/cycles/util/types_float3.h index fc0f35fa87f..cafcfebf526 100644 --- a/intern/cycles/util/types_float3.h +++ b/intern/cycles/util/types_float3.h @@ -88,7 +88,7 @@ struct packed_float3 { }; #endif -static_assert(sizeof(packed_float3) == 12); +static_assert(sizeof(packed_float3) == 12, "packed_float3 expected to be exactly 12 bytes"); CCL_NAMESPACE_END |