Update embree to 3.13.5

4 files changed, 44 insertions, 381 deletions

diff --git a/thirdparty/embree/patches/godot-changes-android.patch b/thirdparty/embree/patches/godot-changes-android.patch
deleted file mode 100644
index a27f924bde..0000000000
--- a/thirdparty/embree/patches/godot-changes-android.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/thirdparty/embree/common/sys/sysinfo.cpp b/thirdparty/embree/common/sys/sysinfo.cpp
-index ba97dc227b..1679599608 100644
---- a/thirdparty/embree/common/sys/sysinfo.cpp
-+++ b/thirdparty/embree/common/sys/sysinfo.cpp
-@@ -618,7 +618,10 @@ namespace embree
-     static int nThreads = -1;
-     if (nThreads != -1) return nThreads;
- 
--#if defined(__MACOSX__)
-+// -- GODOT start --
-+// #if defined(__MACOSX__)
-+#if defined(__MACOSX__) || defined(__ANDROID__)
-+// -- GODOT end --
-     nThreads = sysconf(_SC_NPROCESSORS_ONLN); // does not work in Linux LXC container
-     assert(nThreads);
- #else
-diff --git a/thirdparty/embree/common/sys/thread.cpp b/thirdparty/embree/common/sys/thread.cpp
-index a7827e18f7..f4014be89b 100644
---- a/thirdparty/embree/common/sys/thread.cpp
-+++ b/thirdparty/embree/common/sys/thread.cpp
-@@ -158,7 +158,9 @@ namespace embree
- /// Linux Platform
- ////////////////////////////////////////////////////////////////////////////////
- 
--#if defined(__LINUX__)
-+// -- GODOT start --
-+#if defined(__LINUX__) && !defined(__ANDROID__)
-+// -- GODOT end --
- 
- #include <fstream>
- #include <sstream>
-@@ -247,6 +249,28 @@ namespace embree
- }
- #endif
- 
-+// -- GODOT start --
-+////////////////////////////////////////////////////////////////////////////////
-+/// Android Platform
-+////////////////////////////////////////////////////////////////////////////////
-+
-+#if defined(__ANDROID__)
-+
-+namespace embree
-+{
-+  /*! set affinity of the calling thread */
-+  void setAffinity(ssize_t affinity)
-+  {
-+    cpu_set_t cset;
-+    CPU_ZERO(&cset);
-+    CPU_SET(affinity, &cset);
-+
-+    sched_setaffinity(0, sizeof(cset), &cset);
-+  }
-+}
-+#endif
-+// -- GODOT end --
-+
- ////////////////////////////////////////////////////////////////////////////////
- /// FreeBSD Platform
- ////////////////////////////////////////////////////////////////////////////////
-@@ -355,7 +379,9 @@ namespace embree
-     pthread_attr_destroy(&attr);
- 
-     /* set affinity */
--#if defined(__LINUX__)
-+// -- GODOT start --
-+#if defined(__LINUX__) && !defined(__ANDROID__)
-+// -- GODOT end --
-     if (threadID >= 0) {
-       cpu_set_t cset;
-       CPU_ZERO(&cset);
-@@ -370,7 +396,16 @@ namespace embree
-       CPU_SET(threadID, &cset);
-       pthread_setaffinity_np(*tid, sizeof(cset), &cset);
-     }
-+// -- GODOT start --
-+#elif defined(__ANDROID__)
-+    if (threadID >= 0) {
-+      cpu_set_t cset;
-+      CPU_ZERO(&cset);
-+      CPU_SET(threadID, &cset);
-+      sched_setaffinity(pthread_gettid_np(*tid), sizeof(cset), &cset);
-+    }
- #endif
-+// -- GODOT end --
- 
-     return thread_t(tid);
-   }
-@@ -389,8 +424,14 @@ namespace embree
- 
-   /*! destroy a hardware thread by its handle */
-   void destroyThread(thread_t tid) {
-+// -- GODOT start --
-+#if defined(__ANDROID__)
-+    FATAL("Can't destroy threads on Android.");
-+#else
-     pthread_cancel(*(pthread_t*)tid);
-     delete (pthread_t*)tid;
-+#endif
-+// -- GODOT end --
-   }
- 
-   /*! creates thread local storage */
diff --git a/thirdparty/embree/patches/godot-changes-misc.patch b/thirdparty/embree/patches/godot-changes-misc.patch
deleted file mode 100644
index 8bf0d9fa97..0000000000
--- a/thirdparty/embree/patches/godot-changes-misc.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/thirdparty/embree/common/sys/intrinsics.h b/thirdparty/embree/common/sys/intrinsics.h
-index 79729c87ab..ed8dd7d40a 100644
---- a/thirdparty/embree/common/sys/intrinsics.h
-+++ b/thirdparty/embree/common/sys/intrinsics.h
-@@ -34,8 +34,14 @@
- #endif
- 
- #if defined(__WIN32__)
--#  define NOMINMAX
--#  include <windows.h>
-+// -- GODOT start --
-+#if !defined(NOMINMAX)
-+// -- GODOT end --
-+#define NOMINMAX
-+// -- GODOT start --
-+#endif
-+#include "windows.h"
-+// -- GODOT end --
- #endif
- 
- /* normally defined in pmmintrin.h, but we always need this */
-diff --git a/thirdparty/embree/common/sys/platform.h b/thirdparty/embree/common/sys/platform.h
-index 3fc5e99b8d..697e07bb86 100644
---- a/thirdparty/embree/common/sys/platform.h
-+++ b/thirdparty/embree/common/sys/platform.h
-@@ -99,7 +99,9 @@
- #define dll_import 
- #endif
- 
--#ifdef __WIN32__
-+// -- GODOT start --
-+#if defined(__WIN32__) && !defined(__MINGW32__)
-+// -- GODOT end --
- #if !defined(__noinline)
- #define __noinline             __declspec(noinline)
- #endif
-@@ -149,6 +151,9 @@
-   #define DELETED  = delete
- #endif
- 
-+// -- GODOT start --
-+#if !defined(likely)
-+// -- GODOT end --
- #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
- #define   likely(expr) (expr)
- #define unlikely(expr) (expr)
-@@ -156,6 +161,9 @@
- #define   likely(expr) __builtin_expect((bool)(expr),true )
- #define unlikely(expr) __builtin_expect((bool)(expr),false)
- #endif
-+// -- GODOT start --
-+#endif
-+// -- GODOT end --
- 
- ////////////////////////////////////////////////////////////////////////////////
- /// Error handling and debugging
-diff --git a/thirdparty/embree/common/sys/sysinfo.cpp b/thirdparty/embree/common/sys/sysinfo.cpp
-index ba97dc227b..f1a59e511e 100644
---- a/thirdparty/embree/common/sys/sysinfo.cpp
-+++ b/thirdparty/embree/common/sys/sysinfo.cpp
-@@ -248,7 +248,9 @@ namespace embree
- #if defined(__X86_ASM__)
-   __noinline int64_t get_xcr0() 
-   {
--#if defined (__WIN32__)
-+// -- GODOT start --
-+#if defined (__WIN32__) && !defined (__MINGW32__)
-+// -- GODOT end --
-     int64_t xcr0 = 0; // int64_t is workaround for compiler bug under VS2013, Win32
-     xcr0 = _xgetbv(0);
-     return xcr0;
-diff --git a/thirdparty/embree/include/embree3/rtcore_common.h b/thirdparty/embree/include/embree3/rtcore_common.h
-index 9c14b28745..4857e1e05e 100644
---- a/thirdparty/embree/include/embree3/rtcore_common.h
-+++ b/thirdparty/embree/include/embree3/rtcore_common.h
-@@ -19,7 +19,9 @@ typedef int ssize_t;
- #endif
- #endif
- 
--#ifdef _WIN32
-+// -- GODOT start --
-+#if defined(_WIN32) && defined(_MSC_VER)
-+// -- GODOT end --
- #  define RTC_ALIGN(...) __declspec(align(__VA_ARGS__))
- #else
- #  define RTC_ALIGN(...) __attribute__((aligned(__VA_ARGS__)))
-diff --git a/thirdparty/embree/common/tasking/taskschedulertbb.h b/thirdparty/embree/common/tasking/taskschedulertbb.h
-index 3fd15816e9..35bd49849f 100644
---- a/thirdparty/embree/common/tasking/taskschedulertbb.h
-+++ b/thirdparty/embree/common/tasking/taskschedulertbb.h
-@@ -12,7 +12,13 @@
- #include "../sys/ref.h"
- 
- #if defined(__WIN32__)
-+// -- GODOT start --
-+#if !defined(NOMINMAX)
-+// -- GODOT end --
- #  define NOMINMAX
-+// -- GODOT start --
-+#endif
-+// -- GODOT end --
- #endif
- 
- // We need to define these to avoid implicit linkage against
- 
\ No newline at end of file
diff --git a/thirdparty/embree/patches/godot-changes-noexcept.patch b/thirdparty/embree/patches/godot-changes-noexcept.patch
index 598a7f2ddc..84169c36e4 100644
--- a/thirdparty/embree/patches/godot-changes-noexcept.patch
+++ b/thirdparty/embree/patches/godot-changes-noexcept.patch
@@ -1,5 +1,5 @@
 diff --git a/thirdparty/embree/common/algorithms/parallel_for.h b/thirdparty/embree/common/algorithms/parallel_for.h
-index f052d8b468..645681ac63 100644
+index f2969a88f1..6d411e4852 100644
 --- a/thirdparty/embree/common/algorithms/parallel_for.h
 +++ b/thirdparty/embree/common/algorithms/parallel_for.h
 @@ -21,7 +21,10 @@ namespace embree
@@ -12,9 +12,9 @@ index f052d8b468..645681ac63 100644
 +        abort();
 +        // -- GODOT end --
      }
-     
  #elif defined(TASKING_TBB)
-@@ -31,13 +34,19 @@ namespace embree
+   #if TBB_INTERFACE_VERSION >= 12002
+@@ -30,13 +33,19 @@ namespace embree
          func(i);
        },context);
      if (context.is_group_execution_cancelled())
@@ -36,7 +36,7 @@ index f052d8b468..645681ac63 100644
    #endif
  
  #elif defined(TASKING_PPL)
-@@ -57,7 +66,10 @@ namespace embree
+@@ -56,7 +65,10 @@ namespace embree
  #if defined(TASKING_INTERNAL)
      TaskScheduler::spawn(first,last,minStepSize,func);
      if (!TaskScheduler::wait())
@@ -48,7 +48,7 @@ index f052d8b468..645681ac63 100644
  
  #elif defined(TASKING_TBB)
    #if TBB_INTERFACE_VERSION >= 12002
-@@ -66,13 +78,19 @@ namespace embree
+@@ -65,13 +77,19 @@ namespace embree
          func(range<Index>(r.begin(),r.end()));
        },context);
      if (context.is_group_execution_cancelled())
@@ -70,7 +70,7 @@ index f052d8b468..645681ac63 100644
    #endif
  
  #elif defined(TASKING_PPL)
-@@ -104,13 +122,19 @@ namespace embree
+@@ -103,13 +121,19 @@ namespace embree
            func(i);
          },tbb::simple_partitioner(),context);
        if (context.is_group_execution_cancelled())
@@ -92,7 +92,7 @@ index f052d8b468..645681ac63 100644
      #endif
    }
  
-@@ -125,13 +149,19 @@ namespace embree
+@@ -124,13 +148,19 @@ namespace embree
            func(i);
          },ap,context);
        if (context.is_group_execution_cancelled())
@@ -115,7 +115,7 @@ index f052d8b468..645681ac63 100644
    }
  
 diff --git a/thirdparty/embree/common/algorithms/parallel_reduce.h b/thirdparty/embree/common/algorithms/parallel_reduce.h
-index f42ae2ec50..8271372ea4 100644
+index 1a94aad8c4..cd0078f2e6 100644
 --- a/thirdparty/embree/common/algorithms/parallel_reduce.h
 +++ b/thirdparty/embree/common/algorithms/parallel_reduce.h
 @@ -58,15 +58,19 @@ namespace embree
@@ -247,10 +247,10 @@ index 1bc30fe9a5..abdd269069 100644
  
    /* hint for transparent huge pages (THP) */
 diff --git a/thirdparty/embree/common/sys/platform.h b/thirdparty/embree/common/sys/platform.h
-index 8a6d9fa0a9..697e07bb86 100644
+index be3ec36436..728bf6ed7d 100644
 --- a/thirdparty/embree/common/sys/platform.h
 +++ b/thirdparty/embree/common/sys/platform.h
-@@ -179,11 +179,19 @@
+@@ -178,11 +178,19 @@
  #define PRINT4(x,y,z,w) embree_cout << STRING(x) << " = " << (x) << ", " << STRING(y) << " = " << (y) << ", " << STRING(z) << " = " << (z) << ", " << STRING(w) << " = " << (w) << embree_endl
  
  #if defined(DEBUG) // only report file and line in debug mode
@@ -351,7 +351,7 @@ index dca835a716..ad438588a3 100644
  
    bool TaskScheduler::steal_from_other_threads(Thread& thread)
 diff --git a/thirdparty/embree/common/tasking/taskschedulerinternal.h b/thirdparty/embree/common/tasking/taskschedulerinternal.h
-index c766a0bb6a..8fa6bb12fa 100644
+index 61a0e57c5b..6cc2495195 100644
 --- a/thirdparty/embree/common/tasking/taskschedulerinternal.h
 +++ b/thirdparty/embree/common/tasking/taskschedulerinternal.h
 @@ -123,7 +123,10 @@ namespace embree
@@ -391,7 +391,7 @@ index c766a0bb6a..8fa6bb12fa 100644
      /*! steals a task from a different thread */
      bool steal_from_other_threads(Thread& thread);
 diff --git a/thirdparty/embree/kernels/bvh/bvh_statistics.cpp b/thirdparty/embree/kernels/bvh/bvh_statistics.cpp
-index d8da78eed7..d857ff7d95 100644
+index 40f9043736..57f75bfd7e 100644
 --- a/thirdparty/embree/kernels/bvh/bvh_statistics.cpp
 +++ b/thirdparty/embree/kernels/bvh/bvh_statistics.cpp
 @@ -150,7 +150,10 @@ namespace embree
@@ -407,10 +407,10 @@ index d8da78eed7..d857ff7d95 100644
      return s;
    } 
 diff --git a/thirdparty/embree/kernels/common/rtcore.cpp b/thirdparty/embree/kernels/common/rtcore.cpp
-index 74e9fb335c..94b3819e42 100644
+index 95a94319ec..a6ea55bfc4 100644
 --- a/thirdparty/embree/kernels/common/rtcore.cpp
 +++ b/thirdparty/embree/kernels/common/rtcore.cpp
-@@ -197,7 +197,10 @@ RTC_NAMESPACE_BEGIN;
+@@ -198,7 +198,10 @@ RTC_NAMESPACE_BEGIN;
      if (quality != RTC_BUILD_QUALITY_LOW &&
          quality != RTC_BUILD_QUALITY_MEDIUM &&
          quality != RTC_BUILD_QUALITY_HIGH)
@@ -422,7 +422,7 @@ index 74e9fb335c..94b3819e42 100644
      scene->setBuildQuality(quality);
      RTC_CATCH_END2(scene);
    }
-@@ -1350,7 +1353,10 @@ RTC_NAMESPACE_BEGIN;
+@@ -1351,7 +1354,10 @@ RTC_NAMESPACE_BEGIN;
          quality != RTC_BUILD_QUALITY_MEDIUM &&
          quality != RTC_BUILD_QUALITY_HIGH &&
          quality != RTC_BUILD_QUALITY_REFIT)
@@ -435,172 +435,67 @@ index 74e9fb335c..94b3819e42 100644
      RTC_CATCH_END2(geometry);
    }
 diff --git a/thirdparty/embree/kernels/common/rtcore.h b/thirdparty/embree/kernels/common/rtcore.h
-index 4e4b24e9c2..373e49a689 100644
+index 4e4b24e9c2..ac58a84d6f 100644
 --- a/thirdparty/embree/kernels/common/rtcore.h
 +++ b/thirdparty/embree/kernels/common/rtcore.h
-@@ -25,52 +25,58 @@ namespace embree
+@@ -25,6 +25,13 @@ namespace embree
  #endif
  
  /*! Macros used in the rtcore API implementation */
--#define RTC_CATCH_BEGIN try {
 +// -- GODOT start --
-+// #define RTC_CATCH_BEGIN try {
 +#define RTC_CATCH_BEGIN
-   
--#define RTC_CATCH_END(device)                                                \
--  } catch (std::bad_alloc&) {                                                   \
--    Device::process_error(device,RTC_ERROR_OUT_OF_MEMORY,"out of memory");      \
--  } catch (rtcore_error& e) {                                                   \
--    Device::process_error(device,e.error,e.what());                             \
--  } catch (std::exception& e) {                                                 \
--    Device::process_error(device,RTC_ERROR_UNKNOWN,e.what());                   \
--  } catch (...) {                                                               \
--    Device::process_error(device,RTC_ERROR_UNKNOWN,"unknown exception caught"); \
--  }
-+// #define RTC_CATCH_END(device)                                                \
-+//   } catch (std::bad_alloc&) {                                                   \
-+//     Device::process_error(device,RTC_ERROR_OUT_OF_MEMORY,"out of memory");      \
-+//   } catch (rtcore_error& e) {                                                   \
-+//     Device::process_error(device,e.error,e.what());                             \
-+//   } catch (std::exception& e) {                                                 \
-+//     Device::process_error(device,RTC_ERROR_UNKNOWN,e.what());                   \
-+//   } catch (...) {                                                               \
-+//     Device::process_error(device,RTC_ERROR_UNKNOWN,"unknown exception caught"); \
-+//   }
 +#define RTC_CATCH_END(device)
-   
--#define RTC_CATCH_END2(scene)                                                \
--  } catch (std::bad_alloc&) {                                                   \
--    Device* device = scene ? scene->device : nullptr;                           \
--    Device::process_error(device,RTC_ERROR_OUT_OF_MEMORY,"out of memory");      \
--  } catch (rtcore_error& e) {                                                   \
--    Device* device = scene ? scene->device : nullptr;                           \
--    Device::process_error(device,e.error,e.what());                             \
--  } catch (std::exception& e) {                                                 \
--    Device* device = scene ? scene->device : nullptr;                           \
--    Device::process_error(device,RTC_ERROR_UNKNOWN,e.what());                   \
--  } catch (...) {                                                               \
--    Device* device = scene ? scene->device : nullptr;                           \
--    Device::process_error(device,RTC_ERROR_UNKNOWN,"unknown exception caught"); \
--  }
-+// #define RTC_CATCH_END2(scene)                                                \
-+//   } catch (std::bad_alloc&) {                                                   \
-+//     Device* device = scene ? scene->device : nullptr;                           \
-+//     Device::process_error(device,RTC_ERROR_OUT_OF_MEMORY,"out of memory");      \
-+//   } catch (rtcore_error& e) {                                                   \
-+//     Device* device = scene ? scene->device : nullptr;                           \
-+//     Device::process_error(device,e.error,e.what());                             \
-+//   } catch (std::exception& e) {                                                 \
-+//     Device* device = scene ? scene->device : nullptr;                           \
-+//     Device::process_error(device,RTC_ERROR_UNKNOWN,e.what());                   \
-+//   } catch (...) {                                                               \
-+//     Device* device = scene ? scene->device : nullptr;                           \
-+//     Device::process_error(device,RTC_ERROR_UNKNOWN,"unknown exception caught"); \
-+//   }
 +#define RTC_CATCH_END2(scene)
- 
--#define RTC_CATCH_END2_FALSE(scene)                                             \
--  } catch (std::bad_alloc&) {                                                   \
--    Device* device = scene ? scene->device : nullptr;                           \
--    Device::process_error(device,RTC_ERROR_OUT_OF_MEMORY,"out of memory");      \
--    return false;                                                               \
--  } catch (rtcore_error& e) {                                                   \
--    Device* device = scene ? scene->device : nullptr;                           \
--    Device::process_error(device,e.error,e.what());                             \
--    return false;                                                               \
--  } catch (std::exception& e) {                                                 \
--    Device* device = scene ? scene->device : nullptr;                           \
--    Device::process_error(device,RTC_ERROR_UNKNOWN,e.what());                   \
--    return false;                                                               \
--  } catch (...) {                                                               \
--    Device* device = scene ? scene->device : nullptr;                           \
--    Device::process_error(device,RTC_ERROR_UNKNOWN,"unknown exception caught"); \
--    return false;                                                               \
--  }
-+// #define RTC_CATCH_END2_FALSE(scene)                                             \
-+//   } catch (std::bad_alloc&) {                                                   \
-+//     Device* device = scene ? scene->device : nullptr;                           \
-+//     Device::process_error(device,RTC_ERROR_OUT_OF_MEMORY,"out of memory");      \
-+//     return false;                                                               \
-+//   } catch (rtcore_error& e) {                                                   \
-+//     Device* device = scene ? scene->device : nullptr;                           \
-+//     Device::process_error(device,e.error,e.what());                             \
-+//     return false;                                                               \
-+//   } catch (std::exception& e) {                                                 \
-+//     Device* device = scene ? scene->device : nullptr;                           \
-+//     Device::process_error(device,RTC_ERROR_UNKNOWN,e.what());                   \
-+//     return false;                                                               \
-+//   } catch (...) {                                                               \
-+//     Device* device = scene ? scene->device : nullptr;                           \
-+//     Device::process_error(device,RTC_ERROR_UNKNOWN,"unknown exception caught"); \
-+//     return false;                                                               \
-+//   }
 +#define RTC_CATCH_END2_FALSE(scene) return false;
++
++#if 0
+ #define RTC_CATCH_BEGIN try {
+   
+ #define RTC_CATCH_END(device)                                                \
+@@ -71,6 +78,8 @@ namespace embree
+     Device::process_error(device,RTC_ERROR_UNKNOWN,"unknown exception caught"); \
+     return false;                                                               \
+   }
++#endif
 +// -- GODOT end --
  
  #define RTC_VERIFY_HANDLE(handle)                               \
    if (handle == nullptr) {                                         \
-@@ -97,28 +103,38 @@ namespace embree
+@@ -97,6 +106,8 @@ namespace embree
  #define RTC_TRACE(x) 
  #endif
  
--  /*! used to throw embree API errors */
--  struct rtcore_error : public std::exception
--  {
--    __forceinline rtcore_error(RTCError error, const std::string& str)
--      : error(error), str(str) {}
--    
--    ~rtcore_error() throw() {}
--    
--    const char* what () const throw () {
--      return str.c_str();
--    }
--    
--    RTCError error;
--    std::string str;
--  };
-+// -- GODOT begin --
-+//   /*! used to throw embree API errors */
-+//   struct rtcore_error : public std::exception
-+//   {
-+//     __forceinline rtcore_error(RTCError error, const std::string& str)
-+//       : error(error), str(str) {}
-+//     
-+//     ~rtcore_error() throw() {}
-+//     
-+//     const char* what () const throw () {
-+//       return str.c_str();
-+//     }
-+//     
-+//     RTCError error;
-+//     std::string str;
-+//   };
-+// -- GODOT end --
++// -- GODOT start --
++#if 0
+   /*! used to throw embree API errors */
+   struct rtcore_error : public std::exception
+   {
+@@ -112,14 +123,18 @@ namespace embree
+     RTCError error;
+     std::string str;
+   };
++#endif
  
  #if defined(DEBUG) // only report file and line in debug mode
-+  // -- GODOT begin --
-+  // #define throw_RTCError(error,str) \
-+  //   throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
    #define throw_RTCError(error,str) \
 -    throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
 +    printf("%s (%d): %s", __FILE__, __LINE__, std::string(str).c_str()), abort();
-+  // -- GODOT end --
++    // throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
  #else
-+  // -- GODOT begin --
-+  // #define throw_RTCError(error,str) \
-+  //   throw rtcore_error(error,str);
    #define throw_RTCError(error,str) \
 -    throw rtcore_error(error,str);
 +    abort();
-+  // -- GODOT end --
++    // throw rtcore_error(error,str);
  #endif
++// -- GODOT end --
  
  #define RTC_BUILD_ARGUMENTS_HAS(settings,member) \
+   (settings.byteSize > (offsetof(RTCBuildArguments,member)+sizeof(settings.member))) 
 diff --git a/thirdparty/embree/kernels/common/scene.cpp b/thirdparty/embree/kernels/common/scene.cpp
-index 0149055f2c..408d7eae6f 100644
+index ad1916c54e..65d31d0f81 100644
 --- a/thirdparty/embree/kernels/common/scene.cpp
 +++ b/thirdparty/embree/kernels/common/scene.cpp
-@@ -792,16 +792,18 @@ namespace embree
+@@ -790,16 +790,18 @@ namespace embree
      }
  
      /* initiate build */
diff --git a/thirdparty/embree/patches/godot-changes-ubsan.patch b/thirdparty/embree/patches/godot-changes-ubsan.patch
deleted file mode 100644
index 1336246f0d..0000000000
--- a/thirdparty/embree/patches/godot-changes-ubsan.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/thirdparty/embree/kernels/builders/primrefgen.cpp b/thirdparty/embree/kernels/builders/primrefgen.cpp
-index bb4fc81dfe..d279dc4993 100644
---- a/thirdparty/embree/kernels/builders/primrefgen.cpp
-+++ b/thirdparty/embree/kernels/builders/primrefgen.cpp
-@@ -184,6 +184,9 @@ namespace embree
- 
-     // special variants for grid meshes
- 
-+// -- GODOT start --
-+#if defined(EMBREE_GEOMETRY_GRID)
-+// -- GODOT end --
-     PrimInfo createPrimRefArrayGrids(Scene* scene, mvector<PrimRef>& prims, mvector<SubGridBuildData>& sgrids)
-     {
-       PrimInfo pinfo(empty);
-@@ -293,6 +296,9 @@ namespace embree
- 
-       return pinfo;
-     }
-+// -- GODOT start --
-+#endif
-+// -- GODOT end --
-     
-     // ====================================================================================================
-     // ====================================================================================================