Merge branch 'refs/heads/blender-3.6.2-release' into upbge-v0.36-release

UPBGE · Aug 18, 2023 · 191b76b · 191b76b
2 parents 67ed28a + e53e559
commit 191b76b
Show file tree

Hide file tree

Showing 69 changed files with 2,450 additions and 732 deletions.
diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake
@@ -48,7 +48,7 @@ set(OPENVDB_PATCH ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATC
 if(APPLE)
   set(OPENVDB_PATCH
     ${OPENVDB_PATCH} &&
-    ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_metal.diff
+    ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_metal.diff
   )
 endif()
 

diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
@@ -478,8 +478,8 @@ set(EMBREE_HASH_TYPE MD5)
 set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)
 
 set(USD_VERSION 23.05)
-set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)
-set(USD_HASH 56684f4fdd1a9209dabf03856be5eca6)
+set(USD_URI https://github.com/PixarAnimationStudios/OpenUSD/archive/v${USD_VERSION}.tar.gz)
+set(USD_HASH d4d92ff112bc82a1718bcd129b853a54)
 set(USD_HASH_TYPE MD5)
 set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 

diff --git a/build_files/build_environment/install_linux_packages.py b/build_files/build_environment/install_linux_packages.py
@@ -267,6 +267,20 @@ def __init__(self, name, is_group=False, is_mandatory=False,
                                   DISTRO_ID_ARCH: "dbus",
                                   },
             ),
+    Package(name="OpenGL Library",
+            distro_package_names={DISTRO_ID_DEBIAN: "libgl-dev",
+                                  DISTRO_ID_FEDORA: "mesa-libGL-devel",
+                                  DISTRO_ID_SUSE: "Mesa-libGL-devel",
+                                  DISTRO_ID_ARCH: "libglvnd",
+                                  },
+            ),
+    Package(name="EGL Library",
+            distro_package_names={DISTRO_ID_DEBIAN: "libegl-dev",
+                                  DISTRO_ID_FEDORA: "mesa-libEGL-devel",
+                                  DISTRO_ID_SUSE: "Mesa-libEGL-devel",
+                                  DISTRO_ID_ARCH: None, # Included in libglvnd.
+                                  },
+            ),
 )
 
 

diff --git a/build_files/build_environment/patches/embree.diff b/build_files/build_environment/patches/embree.diff
@@ -24,3 +24,57 @@ index 7c2f43d..106b1d5 100644
    DISABLE_STACK_PROTECTOR_FOR_INTERSECTORS(${EMBREE_LIBRARY_FILES_AVX2})
    ADD_LIBRARY(embree_avx2 STATIC ${EMBREE_LIBRARY_FILES_AVX2})
    TARGET_LINK_LIBRARIES(embree_avx2 PRIVATE tasking)
+diff --git a/kernels/rthwif/rtbuild/rtbuild.cpp b/kernels/rthwif/rtbuild/rtbuild.cpp
+index 6d439f939..367b1ce7b 100644
+--- a/kernels/rthwif/rtbuild/rtbuild.cpp
++++ b/kernels/rthwif/rtbuild/rtbuild.cpp
+@@ -10,7 +10,7 @@ namespace embree
+ {
+   using namespace embree::isa;
+
+-  static std::unique_ptr<tbb::task_arena> g_arena;
++  static tbb::task_arena g_arena(tbb::this_task_arena::max_concurrency(),tbb::this_task_arena::max_concurrency());
+
+   typedef enum _ze_raytracing_accel_format_internal_t {
+     ZE_RTAS_DEVICE_FORMAT_EXP_INVALID = 0,      // invalid acceleration structure format
+@@ -210,13 +210,10 @@ namespace embree
+
+   RTHWIF_API void zeRTASInitExp()
+   {
+-    uint32_t numThreads = tbb::this_task_arena::max_concurrency();
+-    g_arena.reset(new tbb::task_arena(numThreads,numThreads));
+   }
+
+   RTHWIF_API void zeRTASExitExp()
+   {
+-    g_arena.reset();
+   }
+
+   typedef struct _zet_base_desc_t
+@@ -740,7 +737,7 @@ namespace embree
+       //if (op->hBuilder != hBuilder)
+       //  return ZE_RESULT_ERROR_INVALID_ARGUMENT;
+
+-      g_arena->execute([&](){ op->group.run([=](){
++      g_arena.execute([&](){ op->group.run([=](){
+          op->errorCode = zeRTASBuilderBuildExpInternal(args,
+                                                        pScratchBuffer, scratchBufferSizeBytes,
+                                                        pRtasBuffer, rtasBufferSizeBytes,
+@@ -753,7 +750,7 @@ namespace embree
+     else
+     {
+       ze_result_t errorCode = ZE_RESULT_SUCCESS;
+-      g_arena->execute([&](){ errorCode = zeRTASBuilderBuildExpInternal(args,
++      g_arena.execute([&](){ errorCode = zeRTASBuilderBuildExpInternal(args,
+                                                                         pScratchBuffer, scratchBufferSizeBytes,
+                                                                         pRtasBuffer, rtasBufferSizeBytes,
+                                                                         pBuildUserPtr, pBounds, pRtasBufferSizeBytes);
+@@ -801,7 +798,7 @@ namespace embree
+     VALIDATE(hParallelOperation);
+
+     ze_rtas_parallel_operation_t* op = (ze_rtas_parallel_operation_t*) hParallelOperation;
+-    g_arena->execute([&](){ op->group.wait(); });
++    g_arena.execute([&](){ op->group.wait(); });
+     return op->errorCode;
+   }
+ }