Skip to content

Commit

Permalink
upgrade embree to v4.3.3 and fix fmt formatter for RTCError (#6901)
Browse files Browse the repository at this point in the history
* use rtcGetErrorString instead
* upgrade embree to v4.3.3
  • Loading branch information
daizhirui committed Aug 14, 2024
1 parent e86fcb3 commit 7f9377d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 27 deletions.
4 changes: 2 additions & 2 deletions 3rdparty/embree/embree.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 1 addition & 25 deletions cpp/open3d/t/geometry/RaycastingScene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1180,31 +1180,7 @@ template <>
struct formatter<RTCError> {
template <typename FormatContext>
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<string_view>::format(name, ctx);
const char* name = rtcGetErrorString(c);
return format_to(ctx.out(), name);
}

Expand Down

0 comments on commit 7f9377d

Please sign in to comment.