Fix Cycles CUDA/HIP compiler error after recent changes

2021-11-17 18:46:21 +01:00 · 2021-11-17 18:46:21 +01:00 · fa7a6d67a8
parent d9bc8f189c
commit fa7a6d67a8
2 changed files with 3 additions and 2 deletions
--- 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}
--- 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