Merge remote-tracking branch 'b/main'

extern/glog/README.blender

@@ -8,3 +8,5 @@ Local modifications:
 * Added special definitions of HAVE_SNPRINTF and HAVE_LIB_GFLAGS
  in Windows' specific config.h.
 * Silenced syscall deprecation warnings on macOS >= 10.12.
+* Usage of syscall() is not allowed and use getthrid() to
+ retreive the thread ID on OpenBSD

extern/glog/src/config.h

@@ -2,6 +2,8 @@
  #include "config_mac.h"
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  #include "config_freebsd.h"
+#elif defined(__OpenBSD__)
+ #include "config_openbsd.h"
 #elif defined(__MINGW32__)
  #include "windows/config.h"
 #elif defined(__linux__)

extern/glog/src/config_openbsd.h

@@ -0,0 +1,192 @@
+/* define if glog doesn't use RTTI */
+/* #undef DISABLE_RTTI */
+
+/* Namespace for Google classes */
+#define GOOGLE_NAMESPACE google
+
+/* Define if you have the `dladdr' function */
+/* #undef HAVE_DLADDR */
+
+/* Define if you have the `snprintf' function */
+#define HAVE_SNPRINTF
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H
+
+/* Define to 1 if you have the <execinfo.h> header file. */
+/* #undef HAVE_EXECINFO_H */
+
+/* Define if you have the `fcntl' function */
+#define HAVE_FCNTL
+
+/* Define to 1 if you have the <glob.h> header file. */
+#define HAVE_GLOB_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#define HAVE_LIBPTHREAD
+
+/* Define to 1 if you have the <libunwind.h> header file. */
+/* #undef HAVE_LIBUNWIND_H */
+
+/* define if you have google gflags library */
+#define HAVE_LIB_GFLAGS
+
+/* define if you have google gmock library */
+/* #undef HAVE_LIB_GMOCK */
+
+/* define if you have google gtest library */
+/* #undef HAVE_LIB_GTEST */
+
+/* define if you have libunwind */
+/* #undef HAVE_LIB_UNWIND */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H
+
+/* define to disable multithreading support. */
+/* #undef NO_THREADS */
+
+/* define if the compiler implements namespaces */
+#define HAVE_NAMESPACES
+
+/* Define if you have the 'pread' function */
+#define HAVE_PREAD
+
+/* Define if you have POSIX threads libraries and header files. */
+#define HAVE_PTHREAD
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#define HAVE_PWD_H
+
+/* Define if you have the 'pwrite' function */
+#define HAVE_PWRITE
+
+/* define if the compiler implements pthread_rwlock_* */
+#define HAVE_RWLOCK 1
+
+/* Define if you have the 'sigaction' function */
+#define HAVE_SIGACTION
+
+/* Define if you have the `sigaltstack' function */
+#define HAVE_SIGALTSTACK 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H
+
+/* Define to 1 if you have the <syscall.h> header file. */
+/* #undef HAVE_SYSCALL_H */
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/syscall.h> header file. */
+#define HAVE_SYS_SYSCALL_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/ucontext.h> header file. */
+/* #undef HAVE_SYS_UCONTEXT_H */
+
+/* Define to 1 if you have the <sys/utsname.h> header file. */
+#define HAVE_SYS_UTSNAME_H
+
+/* Define to 1 if you have the <ucontext.h> header file. */
+/* #undef HAVE_UCONTEXT_H */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <unwind.h> header file. */
+#define HAVE_UNWIND_H 1
+
+/* define if the compiler supports using expression for operator */
+#define HAVE_USING_OPERATOR
+
+/* define if your compiler has __attribute__ */
+#define HAVE___ATTRIBUTE__
+
+/* define if your compiler has __builtin_expect */
+#define HAVE___BUILTIN_EXPECT 1
+
+/* define if your compiler has __sync_val_compare_and_swap */
+#define HAVE___SYNC_VAL_COMPARE_AND_SWAP
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+/* #undef LT_OBJDIR */
+
+/* Name of package */
+/* #undef PACKAGE */
+
+/* Define to the address where bug reports for this package should be sent. */
+/* #undef PACKAGE_BUGREPORT */
+
+/* Define to the full name of this package. */
+/* #undef PACKAGE_NAME */
+
+/* Define to the full name and version of this package. */
+/* #undef PACKAGE_STRING */
+
+/* Define to the one symbol short name of this package. */
+/* #undef PACKAGE_TARNAME */
+
+/* Define to the home page for this package. */
+/* #undef PACKAGE_URL */
+
+/* Define to the version of this package. */
+/* #undef PACKAGE_VERSION */
+
+/* How to access the PC from a struct ucontext */
+/* #undef PC_FROM_UCONTEXT */
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+ your system. */
+/* #undef PTHREAD_CREATE_JOINABLE */
+
+/* The size of `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 8
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* the namespace where STL code like vector<> is defined */
+#define STL_NAMESPACE std
+
+/* location of source code */
+#define TEST_SRC_DIR "."
+
+/* Version number of package */
+/* #undef VERSION */
+
+/* Stops putting the code inside the Google namespace */
+#define _END_GOOGLE_NAMESPACE_ }
+
+/* Puts following code inside the Google namespace */
+#define _START_GOOGLE_NAMESPACE_ namespace google {
+
+#define GOOGLE_GLOG_DLL_DECL
+
+/* isn't getting defined by configure script when clang compilers are used
+ and cuases compilation errors in stactrace/unwind modules */
+#ifdef __clang__
+# define NO_FRAME_POINTER
+#endif

extern/glog/src/raw_logging.cc

@@ -59,7 +59,8 @@
 # include <unistd.h>
 #endif
 
-#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && (!(defined OS_MACOSX))
+#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && \
+ (!(defined OS_MACOSX) && !(defined OS_OPENBSD))
 # define safe_write(fd, s, len) syscall(SYS_write, fd, s, len)
 #else
  // Not so safe, but what can you do?

extern/glog/src/utilities.cc

@@ -282,6 +282,8 @@ pid_t GetTID() {
  return getpid(); // Linux: getpid returns thread ID when gettid is absent
 #elif defined OS_WINDOWS && !defined OS_CYGWIN
  return GetCurrentThreadId();
+#elif defined OS_OPENBSD
+ return getthrid();
 #else
  // If none of the techniques above worked, we use pthread_self().
  return (pid_t)(uintptr_t)pthread_self();

intern/cycles/kernel/device/oneapi/context_begin.h

@@ -2,8 +2,40 @@
  * Copyright 2021-2022 Intel Corporation */
 
 #ifdef WITH_NANOVDB
+/* Data type to replace `double` used in the NanoVDB headers. Cycles don't need doubles, and is
+ * safer and more portable to never use double datatype on GPU.
+ * Use a special structure, so that the following is true:
+ * - No unnoticed implicit cast or mathematical operations used on scalar 64bit type
+ * (which rules out trick like using `uint64_t` as a drop-in replacement for double).
+ * - Padding rules are matching exactly `double`
+ * (which rules out array of `uint8_t`). */
+typedef struct ccl_vdb_double_t {
+ union ccl_vdb_helper_t {
+ double d;
+ uint64_t i;
+ };
+
+ uint64_t i;
+ ccl_vdb_double_t(double value)
+ {
+ ccl_vdb_helper_t helper;
+ helper.d = value;
+ i = helper.i;
+ }
+ /* We intentionally allow conversion to float in order to workaround compilation errors
+ * for defined math functions that take doubles. */
+ operator float() const
+ {
+ ccl_vdb_helper_t helper;
+ helper.i = i;
+ return (float)helper.d;
+ }
+} ccl_vdb_double_t;
+
+# define double ccl_vdb_double_t
 # include <nanovdb/NanoVDB.h>
 # include <nanovdb/util/SampleFromVoxels.h>
+# undef double
 #endif
 
 /* clang-format off */

intern/cycles/kernel/device/oneapi/kernel.cpp

@@ -109,7 +109,10 @@ size_t oneapi_kernel_preferred_local_size(SyclQueue *queue,
  assert(queue);
  (void)kernel_global_size;
  const static size_t preferred_work_group_size_intersect_shading = 32;
- const static size_t preferred_work_group_size_technical = 1024;
+ /* Shader evalutation kernels seems to use some amount of shared memory, so better
+ * to avoid usage of maximum work group sizes for them. */
+ const static size_t preferred_work_group_size_shader_evaluation = 256;
+ const static size_t preferred_work_group_size_default = 1024;
 
  size_t preferred_work_group_size = 0;
  switch (kernel) {
@@ -133,19 +136,36 @@ size_t oneapi_kernel_preferred_local_size(SyclQueue *queue,
  case DEVICE_KERNEL_INTEGRATOR_QUEUED_SHADOW_PATHS_ARRAY:
  case DEVICE_KERNEL_INTEGRATOR_ACTIVE_PATHS_ARRAY:
  case DEVICE_KERNEL_INTEGRATOR_TERMINATED_PATHS_ARRAY:
- case DEVICE_KERNEL_INTEGRATOR_SORTED_PATHS_ARRAY:
- case DEVICE_KERNEL_INTEGRATOR_COMPACT_PATHS_ARRAY:
- case DEVICE_KERNEL_INTEGRATOR_COMPACT_STATES:
  case DEVICE_KERNEL_INTEGRATOR_TERMINATED_SHADOW_PATHS_ARRAY:
+ case DEVICE_KERNEL_INTEGRATOR_COMPACT_PATHS_ARRAY:
  case DEVICE_KERNEL_INTEGRATOR_COMPACT_SHADOW_PATHS_ARRAY:
+ preferred_work_group_size = GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE;
+ break;
+
+ case DEVICE_KERNEL_INTEGRATOR_SORTED_PATHS_ARRAY:
+ case DEVICE_KERNEL_INTEGRATOR_COMPACT_STATES:
  case DEVICE_KERNEL_INTEGRATOR_COMPACT_SHADOW_STATES:
- case DEVICE_KERNEL_INTEGRATOR_RESET:
- case DEVICE_KERNEL_INTEGRATOR_SHADOW_CATCHER_COUNT_POSSIBLE_SPLITS:
- preferred_work_group_size = preferred_work_group_size_technical;
+ preferred_work_group_size = GPU_PARALLEL_SORTED_INDEX_DEFAULT_BLOCK_SIZE;
+ break;
+
+ case DEVICE_KERNEL_INTEGRATOR_SORT_BUCKET_PASS:
+ case DEVICE_KERNEL_INTEGRATOR_SORT_WRITE_PASS:
+ preferred_work_group_size = GPU_PARALLEL_SORT_BLOCK_SIZE;
+ break;
+
+ case DEVICE_KERNEL_PREFIX_SUM:
+ preferred_work_group_size = GPU_PARALLEL_PREFIX_SUM_DEFAULT_BLOCK_SIZE;
+ break;
+
+ case DEVICE_KERNEL_SHADER_EVAL_DISPLACE:
+ case DEVICE_KERNEL_SHADER_EVAL_BACKGROUND:
+ case DEVICE_KERNEL_SHADER_EVAL_CURVE_SHADOW_TRANSPARENCY:
+ preferred_work_group_size = preferred_work_group_size_shader_evaluation;
  break;
 
  default:
- preferred_work_group_size = 512;
+ preferred_work_group_size = preferred_work_group_size_default;
+ break;
  }
 
  const size_t limit_work_group_size = reinterpret_cast<sycl::queue *>(queue)
@@ -316,12 +336,6 @@ bool oneapi_enqueue_kernel(KernelContext *kernel_context,
  kernel_context->queue, device_kernel, global_size);
  assert(global_size % local_size == 0);
 
- /* Local size for DEVICE_KERNEL_INTEGRATOR_ACTIVE_PATHS_ARRAY needs to be enforced so we
- * overwrite it outside of oneapi_kernel_preferred_local_size. */
- if (device_kernel == DEVICE_KERNEL_INTEGRATOR_ACTIVE_PATHS_ARRAY) {
- local_size = GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE;
- }
-
  /* Kernels listed below need a specific number of work groups. */
  if (device_kernel == DEVICE_KERNEL_INTEGRATOR_ACTIVE_PATHS_ARRAY ||
  device_kernel == DEVICE_KERNEL_INTEGRATOR_QUEUED_PATHS_ARRAY ||

intern/cycles/util/math_float2.h

@@ -134,6 +134,21 @@ ccl_device_inline float len(const float2 a)
  return sqrtf(dot(a, a));
 }
 
+ccl_device_inline float reduce_min(const float2 a)
+{
+ return min(a.x, a.y);
+}
+
+ccl_device_inline float reduce_max(const float2 a)
+{
+ return max(a.x, a.y);
+}
+
+ccl_device_inline float reduce_add(const float2 a)
+{
+ return a.x + a.y;
+}
+
 ccl_device_inline float len_squared(const float2 a)
 {
  return dot(a, a);

scripts/modules/bl_i18n_utils/bl_extract_messages.py

@@ -204,7 +204,7 @@ def dump_rna_messages(msgs, reports, settings, verbose=False):
  def class_blacklist():
  blacklist_rna_class = {getattr(bpy.types, cls_id) for cls_id in (
  # core classes
- "Context", "Event", "Function", "UILayout", "UnknownType", "Property", "Struct",
+ "Context", "Event", "Function", "UILayout", "UnknownType", "Struct",
  # registerable classes
  "Panel", "Menu", "Header", "RenderEngine", "Operator", "OperatorMacro", "Macro", "KeyingSetInfo",
  )

scripts/modules/bl_i18n_utils/settings.py

@@ -256,6 +256,25 @@
  tuple(("{}\\((?:[^,]+,){{2}}\\s*" + _msg_re + r"\s*(?:\)|,)").format(it)
  for it in ("modifier_subpanel_register", "gpencil_modifier_subpanel_register")) +
 
+ # Node socket declarations: contextless names
+ tuple((r"\.{}<decl::.*?>\(\s*" + _msg_re + r"(?:,[^),]+)*\s*\)").format(it)
+ for it in ("add_input", "add_output")) +
+
+ # Node socket declarations: names with contexts
+ tuple((r"\.{}<decl::.*?>\(\s*" + _msg_re + r"[^;]*\.translation_context\(\s*" + _ctxt_re + r"\s*\)").format(it)
+ for it in ("add_input", "add_output")) +
+
+ # Node socket declarations: description and error messages
+ tuple((r"\.{}\(\s*" + _msg_re + r"\s*\)").format(it)
+ for it in ("description", "error_message_add")) +
+
+ # Node socket labels
+ tuple((r"{}\(\s*[^,]+,\s*" + _msg_re + r"\s*\)").format(it)
+ for it in ("node_sock_label",)) +
+
+ # Geometry Nodes field inputs
+ ((r"FieldInput\(CPPType::get<.*?>\(\),\s*" + _msg_re + r"\s*\)"),) +
+
  # bUnitDef unit names.
  # NOTE: regex is a bit more complex than it would need too. Since the actual
  # identifier (`B_UNIT_DEF_`) is at the end, if it's simpler/too general it