griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Lukas Tönne
2025-10-16 12:15:44 +02:00
parent 5c665b7080 2588ea685a
commit 443ced685e
12 changed files with 158 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
intern/cycles/device/metal/bvh.mm
View File

@@ -35,6 +35,14 @@ CCL_NAMESPACE_BEGIN
# define bvh_throttle_printf(...)
# endif
/* This flag didn't exist until Xcode 26.0, so we ensure that it is defined for
* forward-compatibility.
*/
# ifndef MAC_OS_VERSION_26_0
# define MTLAccelerationStructureUsagePreferFastIntersection \
MTLAccelerationStructureUsage(1 << 4)
# endif
/* Limit the number of concurrent BVH builds so that we don't approach unsafe GPU working set
* sizes. */
struct BVHMetalBuildThrottler {
@@ -292,11 +300,9 @@ bool BVHMetal::build_BLAS_mesh(Progress &progress,
accelDesc.usage |= (MTLAccelerationStructureUsageRefit |
MTLAccelerationStructureUsagePreferFastBuild);
}
# if defined(MAC_OS_VERSION_26_0)
else if (@available(macos 26.0, *)) {
accelDesc.usage |= MTLAccelerationStructureUsagePreferFastIntersection;
}
# endif
MTLAccelerationStructureSizes accelSizes = [mtl_device
accelerationStructureSizesWithDescriptor:accelDesc];
@@ -638,11 +644,9 @@ bool BVHMetal::build_BLAS_hair(Progress &progress,
accelDesc.usage |= (MTLAccelerationStructureUsageRefit |
MTLAccelerationStructureUsagePreferFastBuild);
}
# if defined(MAC_OS_VERSION_26_0)
else if (@available(macos 26.0, *)) {
accelDesc.usage |= MTLAccelerationStructureUsagePreferFastIntersection;
}
# endif
MTLAccelerationStructureSizes accelSizes = [mtl_device
accelerationStructureSizesWithDescriptor:accelDesc];
@@ -874,11 +878,9 @@ bool BVHMetal::build_BLAS_pointcloud(Progress &progress,
accelDesc.usage |= (MTLAccelerationStructureUsageRefit |
MTLAccelerationStructureUsagePreferFastBuild);
}
# if defined(MAC_OS_VERSION_26_0)
else if (@available(macos 26.0, *)) {
accelDesc.usage |= MTLAccelerationStructureUsagePreferFastIntersection;
}
# endif
MTLAccelerationStructureSizes accelSizes = [mtl_device
accelerationStructureSizesWithDescriptor:accelDesc];
@@ -1352,11 +1354,9 @@ bool BVHMetal::build_TLAS(Progress &progress,
accelDesc.usage |= (MTLAccelerationStructureUsageRefit |
MTLAccelerationStructureUsagePreferFastBuild);
}
# if defined(MAC_OS_VERSION_26_0)
else if (@available(macos 26.0, *)) {
accelDesc.usage |= MTLAccelerationStructureUsagePreferFastIntersection;
}
# endif
MTLAccelerationStructureSizes accelSizes = [mtl_device
accelerationStructureSizesWithDescriptor:accelDesc];