From 8f7a35e8327c2179dda1bda03bf4d6daf0355d97 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Fri, 5 Apr 2024 13:41:25 +0200 Subject: [PATCH] const cast only for optix 8 as quick fix --- src/rmagine_core/include/rmagine/math/types/Quaternion.hpp | 1 + src/rmagine_optix/src/util/optix/optix_modules.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/rmagine_core/include/rmagine/math/types/Quaternion.hpp b/src/rmagine_core/include/rmagine/math/types/Quaternion.hpp index 3ce1f69..cf7a962 100644 --- a/src/rmagine_core/include/rmagine/math/types/Quaternion.hpp +++ b/src/rmagine_core/include/rmagine/math/types/Quaternion.hpp @@ -100,6 +100,7 @@ struct Quaternion_ * Or parts of different rotations (Slerp) * Ra^(a) * Rb^(b) */ + RMAGINE_INLINE_FUNCTION Quaternion_ pow(const DataT& exp) const; RMAGINE_INLINE_FUNCTION diff --git a/src/rmagine_optix/src/util/optix/optix_modules.cpp b/src/rmagine_optix/src/util/optix/optix_modules.cpp index a260d34..b8c2ba8 100644 --- a/src/rmagine_optix/src/util/optix/optix_modules.cpp +++ b/src/rmagine_optix/src/util/optix/optix_modules.cpp @@ -24,7 +24,11 @@ ProgramModule::~ProgramModule() #if OPTIX_VERSION >= 70400 if(compile_options->payloadTypes) { + #if OPTIX_VERSION >= 80000 cudaFreeHost(const_cast(reinterpret_cast(compile_options->payloadTypes))); + #else + cudaFreeHost(compile_options->payloadTypes); + #endif // OPTIX_VERSION >= 80000 } #endif