mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-21 10:50:54 +00:00
bbddf59241Backport changes from 9999 to 4.3.2 package missing assets add opengl use flag to select backend unbundle bullet/glog/gflags rename USE otf to truetype fix compilation with openvdb-12 fix compilation with optix-8.1.0 refactor cuda configuration refactor hip configuration refactor optix configuration implement optional expensive tests and need configuration Closes: https://bugs.gentoo.org/947591 Closes: https://bugs.gentoo.org/947515 Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
34 lines
1,015 B
Diff
34 lines
1,015 B
Diff
From 7ce8dbf5f82af7c80890d18b27e1d9df6009d5b4 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Mours <pmours@nvidia.com>
|
|
Date: Mon, 18 Nov 2024 13:16:41 +0100
|
|
Subject: [PATCH] Change OptiX function table name for OptiX 8.1 support
|
|
|
|
---
|
|
intern/cycles/device/optix/device.cpp | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/intern/cycles/device/optix/device.cpp b/intern/cycles/device/optix/device.cpp
|
|
index 60a1dbfe4e3..c8608ab5d75 100644
|
|
--- a/intern/cycles/device/optix/device.cpp
|
|
+++ b/intern/cycles/device/optix/device.cpp
|
|
@@ -21,12 +21,16 @@
|
|
# include <optix_function_table_definition.h>
|
|
#endif
|
|
|
|
+#ifndef OPTIX_FUNCTION_TABLE_SYMBOL
|
|
+# define OPTIX_FUNCTION_TABLE_SYMBOL g_optixFunctionTable
|
|
+#endif
|
|
+
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
bool device_optix_init()
|
|
{
|
|
#ifdef WITH_OPTIX
|
|
- if (g_optixFunctionTable.optixDeviceContextCreate != NULL) {
|
|
+ if (OPTIX_FUNCTION_TABLE_SYMBOL.optixDeviceContextCreate != NULL) {
|
|
/* Already initialized function table. */
|
|
return true;
|
|
}
|
|
--
|
|
2.47.2
|
|
|