Skip to content

Commit 7f9377d

Browse files
authored
upgrade embree to v4.3.3 and fix fmt formatter for RTCError (#6901)
* use rtcGetErrorString instead * upgrade embree to v4.3.3
1 parent e86fcb3 commit 7f9377d

File tree

2 files changed

+3
-27
lines changed

2 files changed

+3
-27
lines changed

3rdparty/embree/embree.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ endif()
6767
ExternalProject_Add(
6868
ext_embree
6969
PREFIX embree
70-
URL https://github.com/embree/embree/archive/refs/tags/v4.3.1.tar.gz
71-
URL_HASH SHA256=824edcbb7a8cd393c5bdb7a16738487b21ecc4e1d004ac9f761e934f97bb02a4
70+
URL https://github.com/embree/embree/archive/refs/tags/v4.3.3.tar.gz
71+
URL_HASH SHA256=8a3bc3c3e21aa209d9861a28f8ba93b2f82ed0dc93341dddac09f1f03c36ef2d
7272
DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/embree"
7373
UPDATE_COMMAND ""
7474
CMAKE_ARGS

cpp/open3d/t/geometry/RaycastingScene.cpp

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,31 +1180,7 @@ template <>
11801180
struct formatter<RTCError> {
11811181
template <typename FormatContext>
11821182
auto format(const RTCError& c, FormatContext& ctx) {
1183-
const char* name = nullptr;
1184-
switch (c) {
1185-
case RTC_ERROR_NONE:
1186-
name = "RTC_ERROR_NONE";
1187-
break;
1188-
case RTC_ERROR_UNKNOWN:
1189-
name = "RTC_ERROR_UNKNOWN";
1190-
break;
1191-
case RTC_ERROR_INVALID_ARGUMENT:
1192-
name = "RTC_ERROR_INVALID_ARGUMENT";
1193-
break;
1194-
case RTC_ERROR_INVALID_OPERATION:
1195-
name = "RTC_ERROR_INVALID_OPERATION";
1196-
break;
1197-
case RTC_ERROR_OUT_OF_MEMORY:
1198-
name = "RTC_ERROR_OUT_OF_MEMORY";
1199-
break;
1200-
case RTC_ERROR_UNSUPPORTED_CPU:
1201-
name = "RTC_ERROR_UNSUPPORTED_CPU";
1202-
break;
1203-
case RTC_ERROR_CANCELLED:
1204-
name = "RTC_ERROR_CANCELLED";
1205-
break;
1206-
}
1207-
// return formatter<string_view>::format(name, ctx);
1183+
const char* name = rtcGetErrorString(c);
12081184
return format_to(ctx.out(), name);
12091185
}
12101186

0 commit comments

Comments
 (0)