Merge branch 'AcademySoftwareFoundation:main' into add-testrender-volumes

Author: ThyOwen

.github/workflows/build-steps.yml

@@ -101,6 +101,7 @@ jobs:
       CTEST_TEST_TIMEOUT: ${{inputs.ctest_test_timeout}}
       USE_SIMD: ${{inputs.simd}}
       FMT_VERSION: ${{inputs.fmt_ver}}
+      fmt_BUILD_VERSION: ${{inputs.fmt_ver}}
       OPENCOLORIO_VERSION: ${{inputs.opencolorio_ver}}
       OPENEXR_VERSION: ${{inputs.openexr_ver}}
       OPENIMAGEIO_VERSION: ${{inputs.openimageio_ver}}
@@ -134,7 +135,7 @@ jobs:
           restore-keys: ${{inputs.nametag}}
       - name: Install LLVM and Clang
         if: inputs.llvm_action_ver != ''
-        uses: KyleMayes/install-llvm-action@a7a1a882e2d06ebe05d5bb97c3e1f8c984ae96fc # v2.0.7
+        uses: KyleMayes/install-llvm-action@98e68e10c96dffcb7bfed8b2144541a66b49aa02 # v2.0.8
         with:
           version: ${{ inputs.llvm_action_ver }}
       - name: Dependencies

.github/workflows/ci.yml

@@ -411,25 +411,44 @@ jobs:
             setenvs: export LLVM_VERSION=14.0.0 LLVM_DISTRO_NAME=ubuntu-18.04
                             OPENIMAGEIO_CMAKE_FLAGS="-DBUILD_FMT_VERSION=7.0.1"
                             PUGIXML_VERSION=v1.10
-          - desc: latest releases gcc11/C++17 llvm17 oiio-rel exr3.2 py3.12 avx2 batch-b16avx512
+          - desc: latest releases gcc13/C++17 llvm18 oiio-rel exr3.4 py3.12 avx2 batch-b16avx512
             nametag: linux-latest-releases
             runner: ubuntu-24.04
-            cc_compiler: gcc-13
-            cxx_compiler: g++-13
+            cc_compiler: gcc-14
+            cxx_compiler: g++-14
             cxx_std: 17
-            fmt_ver: 11.1.4
-            opencolorio_ver: v2.4.2
-            openexr_ver: v3.3.3
+            fmt_ver: 12.1.0
+            opencolorio_ver: v2.5.0
+            openexr_ver: v3.4.2
             openimageio_ver: release
-            pybind11_ver: v3.0.0
+            pybind11_ver: v3.0.1
             python_ver: "3.12"
             llvm_action_ver: "18.1.7"
             simd: avx2,f16c
             batched: b8_AVX2,b8_AVX512,b16_AVX512
-            setenvs: export LIBTIFF_VERSION=v4.7.0
+            setenvs: export LIBTIFF_VERSION=v4.7.1
                             PTEX_VERSION=v2.4.3
                             PUGIXML_VERSION=v1.15
-                            FREETYPE_VERSION=VER-2-13-3
+                            FREETYPE_VERSION=VER-2-14-3
+          - desc: latest releases clang18/C++17 llvm18 oiio-rel exr3.4 py3.12 avx2 batch-b16avx512
+            nametag: linux-latest-releases
+            runner: ubuntu-24.04
+            cc_compiler: clang
+            cxx_compiler: clang++
+            cxx_std: 17
+            fmt_ver: 12.1.0
+            opencolorio_ver: v2.5.0
+            openexr_ver: v3.4.2
+            openimageio_ver: release
+            pybind11_ver: v3.0.1
+            python_ver: "3.12"
+            llvm_action_ver: "18.1.7"
+            simd: avx2,f16c
+            batched: b8_AVX2,b8_AVX512,b16_AVX512
+            setenvs: export LIBTIFF_VERSION=v4.7.1
+                            PTEX_VERSION=v2.4.3
+                            PUGIXML_VERSION=v1.15
+                            FREETYPE_VERSION=VER-2-14-3
           - desc: bleeding edge gcc14/C++17 llvm17 oiio/ocio/exr/pybind-main py3.12 avx2 batch-b16avx512
             nametag: linux-bleeding-edge
             runner: ubuntu-24.04
@@ -446,23 +465,26 @@ jobs:
             simd: avx2,f16c
             batched: b8_AVX2,b8_AVX512,b16_AVX512
             setenvs: export PUGIXML_VERSION=master
+                            PTEX_VERSION=v2.4.3
+                            PUGIXML_VERSION=v1.15
+                            FREETYPE_VERSION=VER-2-14-3
           - desc: clang14/C++17 llvm14 py3.10 avx2 batch-b16avx512
             nametag: linux-latest-releases-clang
             runner: ubuntu-22.04
             cxx_compiler: clang++
             cc_compiler: clang
             cxx_std: 17
-            fmt_ver: 8.1.1
+            fmt_ver: 12.1.0
             opencolorio_ver: v2.5.0
-            openexr_ver: v3.1.11
+            openexr_ver: v3.4.2
             openimageio_ver: release
-            pybind11_ver: v2.13.6
+            pybind11_ver: v3.0.1
             python_ver: "3.10"
             simd: avx2,f16c
             batched: b8_AVX2,b8_AVX512,b16_AVX512
             setenvs: export LLVM_VERSION=14.0.0
                             LLVM_DISTRO_NAME=ubuntu-18.04
-                            PUGIXML_VERSION=v1.11.4
+                            PUGIXML_VERSION=v1.15
             # Test formatting. This test entry doesn't do a full build, it
             # just runs clang-format on everything, and passes if nothing is
             # misformatted. Upon failure, the build artifact will be the full
@@ -522,15 +544,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - desc: MacOS-13-Intel llvm17 oiio-release
-            runner: macos-13
-            nametag: macos13-p313
+          - desc: MacOS-15-Intel aclang17/C++17/py3.13 llvm17 oiio-release
+            runner: macos-15-intel
+            nametag: macos15-p313
             cc_compiler: clang
             cxx_compiler: clang++
             cxx_std: 17
             openimageio_ver: dev-3.0
             python_ver: "3.13"
-            aclang: 14
             ctest_test_timeout: 120
             setenvs: export HOMEBREW_PREFIX=/usr/local
                             LLVMBREWVER="@17"
@@ -543,17 +564,15 @@ jobs:
             cxx_std: 17
             openimageio_ver: main
             python_ver: "3.13"
-            aclang: 15
             setenvs: export LLVMBREWVER="@19"
-          - desc: MacOS-15-ARM aclang16/C++17/py3.13 llvm19 oiio-main
+          - desc: MacOS-15-ARM aclang16/C++17/py3.13 llvm21 oiio-main
             runner: macos-15
             nametag: macos15-arm-py313
             cc_compiler: clang
             cxx_compiler: clang++
             cxx_std: 17
             python_ver: "3.13"
             openimageio_ver: main
-            setenvs: export LLVMBREWVER="@19"
 
 
   windows:

INSTALL.md

@@ -49,7 +49,7 @@ NEW or CHANGED minimum dependencies since the last major release are **bold**.
     $OpenImageIO_ROOT/lib to be in your LD_LIBRARY_PATH (or
     DYLD_LIBRARY_PATH on OS X).
 
-* [LLVM](http://www.llvm.org) **14.0 or newer**, 15, 16, 17, 18, 19, 20,
+* [LLVM](http://www.llvm.org) **14.0 or newer**, 15, 16, 17, 18, 19, 20, 21,
   including clang libraries.
 
 * (optional) For GPU rendering on NVIDIA GPUs:

src/cmake/externalpackages.cmake

@@ -58,7 +58,7 @@ checked_find_package (pugixml REQUIRED
 # LLVM library setup
 checked_find_package (LLVM REQUIRED
                       VERSION_MIN 14.0
-                      VERSION_MAX 20.9
+                      VERSION_MAX 21.9
                       PRINT LLVM_SYSTEM_LIBRARIES CLANG_LIBRARIES
                             LLVM_SHARED_MODE)
 # ensure include directory is added (in case of non-standard locations

src/include/OSL/platform.h

@@ -200,6 +200,21 @@
 #endif
 
 // Compiler-specific pragmas
+//
+// - OSL_PRAGMA_WARNING_PUSH/POP pushes/pops warning options (for all
+//   compilers).
+// - OSL_PRAGMA_VISIBILITY_PUSH/POP pushes/pops symbol visibility options (for
+//   all compilers that support it).
+// - OSL_GCC_PRAGMA makes a pragma for all gcc-like compilers, but does nothing
+//   for MSVS.
+// - OSL_GCC_ONLY_PRAGMA makes a pragma for real gcc only.
+// - OSL_CLANG_PRAGMA makes a pragma for all clang-based compilers (including
+//   Apple clang and Intel LLVM).
+// - OSL_NONINTEL_CLANG_PRAGMA makes a pragma for regular clang and Apple
+//   clang, but not Intel clang.
+// - OSL_INTEL_CLASSIC_PRAGMA makes a pragma for icc only.
+// - OSL_INTEL_LLVM_PRAGMA makes a pragma for icx only.
+// - OSL_MSVS_PRAGMA makes a pragma for MSVS only.
 #if defined(__GNUC__) /* gcc, clang, icc */
 #    define OSL_PRAGMA_WARNING_PUSH    OSL_PRAGMA(GCC diagnostic push)
 #    define OSL_PRAGMA_WARNING_POP     OSL_PRAGMA(GCC diagnostic pop)
@@ -223,6 +238,11 @@
 #    else
 #        define OSL_INTEL_LLVM_PRAGMA(UnQuotedPragma)
 #    endif
+#    if defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__INTEL_LLVM_COMPILER)
+#        define OSL_NONINTEL_CLANG_PRAGMA(UnQuotedPragma) OSL_PRAGMA(UnQuotedPragma)
+#    else
+#        define OSL_NONINTEL_CLANG_PRAGMA(UnQuotedPragma)
+#    endif
 #    define OSL_MSVS_PRAGMA(UnQuotedPragma)
 #elif defined(_MSC_VER)
 #    define OSL_PRAGMA_WARNING_PUSH __pragma(warning(push))
@@ -232,6 +252,7 @@
 #    define OSL_GCC_PRAGMA(UnQuotedPragma)
 #    define OSL_GCC_ONLY_PRAGMA(UnQuotedPragma)
 #    define OSL_CLANG_PRAGMA(UnQuotedPragma)
+#    define OSL_NONINTEL_CLANG_PRAGMA(UnQuotedPragma)
 #    define OSL_INTEL_CLASSIC_PRAGMA(UnQuotedPragma)
 #    define OSL_INTEL_LLVM_PRAGMA(UnQuotedPragma)
 #    define OSL_MSVS_PRAGMA(UnQuotedPragma) OSL_PRAGMA(UnQuotedPragma)
@@ -243,6 +264,7 @@
 #    define OSL_GCC_PRAGMA(UnQuotedPragma)
 #    define OSL_GCC_ONLY_PRAGMA(UnQuotedPragma)
 #    define OSL_CLANG_PRAGMA(UnQuotedPragma)
+#    define OSL_NONINTEL_CLANG_PRAGMA(UnQuotedPragma)
 #    define OSL_INTEL_CLASSIC_PRAGMA(UnQuotedPragma)
 #    define OSL_INTEL_LLVM_PRAGMA(UnQuotedPragma)
 #    define OSL_MSVS_PRAGMA(UnQuotedPragma)
@@ -291,6 +313,7 @@
 #define OSL_OMP_SIMD_LOOP(...) OSL_OMP_PRAGMA(omp simd __VA_ARGS__)
 
 #if (OSL_GNUC_VERSION || OSL_INTEL_CLASSIC_COMPILER_VERSION || OSL_INTEL_LLVM_COMPILER_VERSION)
+    // GCC, icc, icx: Use a simd loop for sure
 #   define OSL_OMP_COMPLEX_SIMD_LOOP(...) OSL_OMP_SIMD_LOOP(__VA_ARGS__)
 #else
     // Ignore requests to vectorize complex/nested SIMD loops for certain

src/include/OSL/rs_free_function.h

@@ -316,6 +316,13 @@ OSL_RSOP OSL_HOSTDEVICE bool
 rs_trace_get(OSL::OpaqueExecContextPtr oec, OSL::ustringhash name,
              OSL::TypeDesc type, void* val, bool derivatives);
 
+/// Allocates memory for a closure color. May return null if no memory could
+/// be allocated. It is the renderers responsibility to clean up these
+/// allocations after a shader is run and the closures have been processed.
+OSL_RSOP OSL_HOSTDEVICE void*
+rs_allocate_closure(OSL::OpaqueExecContextPtr oec, size_t size,
+                    size_t alignment);
+
 /// Report errors, warnings, printf, and fprintf.
 /// Fmtlib style format specifier is used (vs. printf style)
 /// Arguments are represented as EncodedTypes (encodedtypes.h) and

src/include/OSL/strdecls.h

@@ -14,6 +14,10 @@
 #    error Do not include this file unless STRDECL is defined
 #endif
 
+// avoid naming conflict with MSVC macro
+#ifdef RGB
+#    undef RGB
+#endif
 
 STRDECL("", _emptystring_)
 STRDECL("camera", camera)

src/liboslcomp/oslcomp.cpp

@@ -171,19 +171,32 @@ OSLCompilerImpl::preprocess_buffer(const std::string& buffer,
     llvm::raw_string_ostream errstream(preproc_errors);
     clang::DiagnosticOptions* diagOptions = new clang::DiagnosticOptions();
     clang::TextDiagnosticPrinter* diagPrinter
+#if OSL_LLVM_VERSION < 210
         = new clang::TextDiagnosticPrinter(errstream, diagOptions);
+#else
+        = new clang::TextDiagnosticPrinter(errstream, *diagOptions);
+#endif
     llvm::IntrusiveRefCntPtr<clang::DiagnosticIDs> diagIDs(
         new clang::DiagnosticIDs);
     clang::DiagnosticsEngine* diagEngine
+#if OSL_LLVM_VERSION < 210
         = new clang::DiagnosticsEngine(diagIDs, diagOptions, diagPrinter);
+#else
+        = new clang::DiagnosticsEngine(diagIDs, *diagOptions, diagPrinter);
+#endif
     inst.setDiagnostics(diagEngine);
 
     const std::shared_ptr<clang::TargetOptions> targetopts
         = std::make_shared<clang::TargetOptions>(inst.getTargetOpts());
     targetopts->Triple = llvm::sys::getDefaultTargetTriple();
     clang::TargetInfo* target
+#if OSL_LLVM_VERSION < 210
         = clang::TargetInfo::CreateTargetInfo(inst.getDiagnostics(),
                                               targetopts);
+#else
+        = clang::TargetInfo::CreateTargetInfo(inst.getDiagnostics(),
+                                              *targetopts);
+#endif
 
     inst.setTarget(target);
 

src/liboslexec/CMakeLists.txt

@@ -194,7 +194,7 @@ if (USE_LLVM_BITCODE)
     EMBED_LLVM_BITCODE_IN_CPP ( "${llvm_ops_srcs}" "_host" "osl_llvm_compiled_ops" lib_src "" "${include_dirs}")
 
     set (rs_dependent_ops_srcs
-         opmatrix.cpp opfmt.cpp optexture.cpp pointcloud.cpp
+         opmatrix.cpp opfmt.cpp optexture.cpp pointcloud.cpp opclosure.cpp
          )
     # Achieve the effect of absorbing osl_llvm_compiled_ops by adding its 
     # sources to rs_dependent_ops_srcs which avoids having to do it at runtime.
@@ -217,6 +217,7 @@ if (USE_LLVM_BITCODE)
             ${CMAKE_SOURCE_DIR}/src/liboslexec/opmatrix.cpp
             ${CMAKE_SOURCE_DIR}/src/liboslexec/optexture.cpp
             ${CMAKE_SOURCE_DIR}/src/liboslexec/pointcloud.cpp
+            ${CMAKE_SOURCE_DIR}/src/liboslexec/opclosure.cpp
             ${CMAKE_SOURCE_DIR}/src/liboslnoise/gabornoise.cpp
             ${CMAKE_SOURCE_DIR}/src/liboslnoise/simplexnoise.cpp
         )
@@ -508,7 +509,10 @@ foreach(batched_target ${BATCHED_TARGET_LIST})
     endforeach(target_src)
 
     add_library ( ${batched_target_lib} MODULE ${TARGET_LIB_SOURCES} )
-      
+    if (WIN32)
+        set_target_properties( ${batched_target_lib} PROPERTIES PREFIX "lib" )
+    endif()
+
     target_include_directories (${batched_target_lib}
         PUBLIC
             ${CMAKE_INSTALL_FULL_INCLUDEDIR}

src/liboslexec/builtindecl.h

@@ -109,29 +109,14 @@
     DECL(osl_##name##_dvdvv, "xXXX")
 
 
-
-#ifndef __CUDA_ARCH__
-DECL(osl_add_closure_closure, "CXCC")
-DECL(osl_mul_closure_float, "CXCf")
-DECL(osl_mul_closure_color, "CXCc")
-DECL(osl_allocate_closure_component, "CXii")
-DECL(osl_allocate_weighted_closure_component, "CXiiX")
-DECL(osl_closure_to_string, "sXC")
-DECL(osl_closure_to_ustringhash, "hXC")
-#else
-// TODO: Figure out why trying to match the signatures between host and device
-//       definitions fails with 'LLVM had to make a cast' assertion failure.
-//
-//       In the meantime, use a signature that matches the definitions in rend_lib.cu,
-//       where void* is used instead of ClosureColor* and ShaderGlobals*.
 DECL(osl_add_closure_closure, "XXXX")
 DECL(osl_mul_closure_float, "XXXf")
-DECL(osl_mul_closure_color, "XXXc")
+DECL(osl_mul_closure_color, "XXXX")
 DECL(osl_allocate_closure_component, "XXii")
 DECL(osl_allocate_weighted_closure_component, "XXiiX")
 DECL(osl_closure_to_string, "sXX")
 DECL(osl_closure_to_ustringhash, "hXX")
-#endif
+
 DECL(osl_format, "hh*")
 DECL(osl_gen_ustringhash_pod, "hs")
 DECL(osl_gen_ustring, "sh")