Merge latest distributed renderering changes from GHE master-cluster into master-cluster on blender.org #1

Merged
William Leeson merged 13 commits from master-cluster_sync_from_ghe_patch into master-cluster 2023-03-31 17:26:02 +02:00

13 Commits

Author SHA1 Message Date
William Leeson
c2408ffdc7 FIX: Don't set env variables in program
User should set the GLOG_v and GLOG_vmodule using environment
variables instead of setting them in the application.
2023-03-31 14:19:31 +02:00
f196973a81 Remove extra whitespace. 2023-03-31 15:35:48 +02:00
bfdcff90b7 Merge branch 'master-cluster_sync_from_ghe_patch' of projects.blender.org:leesonw/blender-cluster into master-cluster_sync_from_ghe_patch 2023-03-31 14:30:51 +02:00
814bdee6c7 FIX: Can use METAL device for rendering with cluster
Adds METAL to the list of supported devices for cluster rendering.
Note that the default device remains OPTIX so the device_type must
be set when rendering on an Apple system.
2023-03-31 13:29:49 +02:00
45abdc0df4 Remove warning for defined as struct when previous def was for class
Removes compiler warning for missmatch between struct vs class.
2023-03-31 13:28:31 +02:00
b32b73f05b FIX: Use the correct executable for the flatc compiler
Use the generator expression to select the flatc compiler.
2023-03-31 13:26:53 +02:00
44f43e229e FIX: Only Unix need bf_intern_libc_compat
Only link with bf_intern_libc_compat if this is a Unix/Linux build
2023-03-31 13:26:00 +02:00
b9e05b976b FIX: Removes CUDA header includes from non-CUDA builds
Builds that don't have CUDA enabled should not include CUDA related
header files.
2023-03-31 10:05:48 +02:00
William Leeson
4e9b36e124 FIX: Allow building on libcluster CUDA kernels
libclusters CUDA kernels were not build as the CUDA_INCLUDE_DIRS is
only defined in certain build types.
2023-03-30 14:04:00 +02:00
William Leeson
9e1f8be465 FIX: Select context for Optix BVH build
The Optix BVH build needed the context to work.
2023-03-30 14:02:39 +02:00
1166f62f41 Merge branch 'master-cluster' into master-cluster_sync_from_ghe_patch 2023-03-30 09:03:59 +02:00
034e662e5b FIX: Correct CMake configuration for CUDA
CUDA_LIBRARY_DIR is not specified with cuew so it was removed.
2023-03-30 09:02:32 +02:00
fd538b52b6 Merge latest distributed renderering changes from GHE master-cluster into master-cluster on blender.org 2023-03-16 13:50:38 -07:00