Commit: 9ad3a85f8b5639c47bd0600475bd3c81d6437d50
Author: Brecht Van Lommel
Date: Mon Feb 6 13:17:57 2023 +0100
Branches: master
https://developer.blender.org/rB9ad3a85f8b5639c47bd0600475bd3c81d6437d50
Fix Cycles GPU binaries build error after recent changes for Metal
===================================================================
M intern/cycles/kernel/device/gpu/parallel_sorted_index.h
===================================================================
diff --git a/intern/cycles/kernel/device/gpu/parallel_sorted_index.h
b/intern/cycles/kernel/device/gpu/parallel_sorted_index.h
index d58ba6134ee..749221af8f9 100644
--- a/intern/cycles/kernel/device/gpu/parallel_sorted_index.h
+++ b/intern/cycles/kernel/device/gpu/parallel_sorted_index.h
@@ -19,11 +19,10 @@ CCL_NAMESPACE_BEGIN
# define GPU_PARALLEL_SORTED_INDEX_DEFAULT_BLOCK_SIZE 512
#endif
#define GPU_PARALLEL_SORTED_INDEX_INACTIVE_KEY (~0)
+#define GPU_PARALLEL_SORT_BLOCK_SIZE 1024
#if defined(__KERNEL_LOCAL_ATOMIC_SORT__)
-# define GPU_PARALLEL_SORT_BLOCK_SIZE 1024
-
# define atomic_store_local(p, x) \
atomic_store_explicit((threadgroup atomic_int *)p, x, memory_order_relaxed)
# define atomic_load_local(p) \
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
