From fa7a6d67a8084d6c26084d811ec959595aa92fdf Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Wed, 17 Nov 2021 18:46:21 +0100
Subject: Fix Cycles CUDA/HIP compiler error after recent changes

---
 intern/cycles/kernel/CMakeLists.txt | 3 ++-
 intern/cycles/util/types_float3.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'intern')

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
 
-- 
cgit v1.2.3