From 7f9377d91fabb9b1c219773931a81ceeeeb95738 Mon Sep 17 00:00:00 2001 From: daizhirui Date: Wed, 14 Aug 2024 10:26:24 -0700 Subject: [PATCH] upgrade embree to v4.3.3 and fix fmt formatter for RTCError (#6901) * use rtcGetErrorString instead * upgrade embree to v4.3.3 --- 3rdparty/embree/embree.cmake | 4 ++-- cpp/open3d/t/geometry/RaycastingScene.cpp | 26 +---------------------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/3rdparty/embree/embree.cmake b/3rdparty/embree/embree.cmake index 35d27f11048..2495c987bbd 100644 --- a/3rdparty/embree/embree.cmake +++ b/3rdparty/embree/embree.cmake @@ -67,8 +67,8 @@ endif() ExternalProject_Add( ext_embree PREFIX embree - URL https://github.com/embree/embree/archive/refs/tags/v4.3.1.tar.gz - URL_HASH SHA256=824edcbb7a8cd393c5bdb7a16738487b21ecc4e1d004ac9f761e934f97bb02a4 + URL https://github.com/embree/embree/archive/refs/tags/v4.3.3.tar.gz + URL_HASH SHA256=8a3bc3c3e21aa209d9861a28f8ba93b2f82ed0dc93341dddac09f1f03c36ef2d DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/embree" UPDATE_COMMAND "" CMAKE_ARGS diff --git a/cpp/open3d/t/geometry/RaycastingScene.cpp b/cpp/open3d/t/geometry/RaycastingScene.cpp index 8906f6373e5..31fdbeef856 100644 --- a/cpp/open3d/t/geometry/RaycastingScene.cpp +++ b/cpp/open3d/t/geometry/RaycastingScene.cpp @@ -1180,31 +1180,7 @@ template <> struct formatter { template auto format(const RTCError& c, FormatContext& ctx) { - const char* name = nullptr; - switch (c) { - case RTC_ERROR_NONE: - name = "RTC_ERROR_NONE"; - break; - case RTC_ERROR_UNKNOWN: - name = "RTC_ERROR_UNKNOWN"; - break; - case RTC_ERROR_INVALID_ARGUMENT: - name = "RTC_ERROR_INVALID_ARGUMENT"; - break; - case RTC_ERROR_INVALID_OPERATION: - name = "RTC_ERROR_INVALID_OPERATION"; - break; - case RTC_ERROR_OUT_OF_MEMORY: - name = "RTC_ERROR_OUT_OF_MEMORY"; - break; - case RTC_ERROR_UNSUPPORTED_CPU: - name = "RTC_ERROR_UNSUPPORTED_CPU"; - break; - case RTC_ERROR_CANCELLED: - name = "RTC_ERROR_CANCELLED"; - break; - } - // return formatter::format(name, ctx); + const char* name = rtcGetErrorString(c); return format_to(ctx.out(), name); }