diff options
Diffstat (limited to 'graphics/filament/files')
6 files changed, 92 insertions, 10 deletions
diff --git a/graphics/filament/files/patch-CMakeLists.txt b/graphics/filament/files/patch-CMakeLists.txt index 40f6db9d930b..108eeb9035b6 100644 --- a/graphics/filament/files/patch-CMakeLists.txt +++ b/graphics/filament/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2024-06-03 18:10:41 UTC +--- CMakeLists.txt.orig 2025-07-14 23:11:31 UTC +++ CMakeLists.txt -@@ -87,7 +87,7 @@ find_program(CCACHE_PROGRAM ccache) +@@ -101,7 +101,7 @@ find_program(CCACHE_PROGRAM ccache) # Support for ccache # ================================================================================================== find_program(CCACHE_PROGRAM ccache) diff --git a/graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp b/graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp index fd6961590dba..bded9df8b8d5 100644 --- a/graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp +++ b/graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp @@ -1,6 +1,6 @@ ---- filament/backend/src/PlatformFactory.cpp.orig 2025-03-31 22:23:27 UTC +--- filament/backend/src/PlatformFactory.cpp.orig 2025-07-14 23:11:31 UTC +++ filament/backend/src/PlatformFactory.cpp -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include <backend/platforms/PlatformCocoaGL.h> #endif #endif @@ -9,7 +9,7 @@ #if defined(FILAMENT_SUPPORTS_X11) #if defined(FILAMENT_SUPPORTS_OPENGL) && !defined(FILAMENT_USE_EXTERNAL_GLES3) #include "backend/platforms/PlatformGLX.h" -@@ -151,7 +151,7 @@ Platform* PlatformFactory::create(Backend* backend) no +@@ -152,7 +152,7 @@ Platform* PlatformFactory::create(Backend* backend) no #else return new PlatformCocoaGL(); #endif diff --git a/graphics/filament/files/patch-libs_bluevk_include_bluevk_BlueVK.h b/graphics/filament/files/patch-libs_bluevk_include_bluevk_BlueVK.h index 3af2733630ee..f084580c50df 100644 --- a/graphics/filament/files/patch-libs_bluevk_include_bluevk_BlueVK.h +++ b/graphics/filament/files/patch-libs_bluevk_include_bluevk_BlueVK.h @@ -1,8 +1,8 @@ ---- libs/bluevk/include/bluevk/BlueVK.h.orig 2022-11-11 07:03:46 UTC +--- libs/bluevk/include/bluevk/BlueVK.h.orig 2025-07-14 23:11:31 UTC +++ libs/bluevk/include/bluevk/BlueVK.h @@ -42,7 +42,7 @@ #define VK_USE_PLATFORM_ANDROID_KHR 1 - #elif defined(IOS) + #elif defined(FILAMENT_IOS) #define VK_USE_PLATFORM_IOS_MVK 1 - #elif defined(__linux__) + #elif defined(__linux__) || defined(__FreeBSD__) diff --git a/graphics/filament/files/patch-libs_utils_CMakeLists.txt b/graphics/filament/files/patch-libs_utils_CMakeLists.txt index 4e45fbc7aa4d..8bf9c71d2a66 100644 --- a/graphics/filament/files/patch-libs_utils_CMakeLists.txt +++ b/graphics/filament/files/patch-libs_utils_CMakeLists.txt @@ -1,7 +1,7 @@ ---- libs/utils/CMakeLists.txt.orig 2023-05-30 23:22:31 UTC +--- libs/utils/CMakeLists.txt.orig 2025-07-14 23:11:31 UTC +++ libs/utils/CMakeLists.txt -@@ -82,8 +82,10 @@ if (ANDROID) - list(APPEND SRCS src/android/Systrace.cpp) +@@ -90,8 +90,10 @@ if (LINUX OR ANDROID) + list(APPEND SRCS src/android/Tracing.cpp) endif() if (LINUX OR ANDROID) - list(APPEND SRCS src/linux/Condition.cpp) diff --git a/graphics/filament/files/patch-third__party_perfetto_perfetto_perfetto.cc b/graphics/filament/files/patch-third__party_perfetto_perfetto_perfetto.cc new file mode 100644 index 000000000000..f760a992860e --- /dev/null +++ b/graphics/filament/files/patch-third__party_perfetto_perfetto_perfetto.cc @@ -0,0 +1,40 @@ +--- third_party/perfetto/perfetto/perfetto.cc.orig 2025-07-16 02:06:53 UTC ++++ third_party/perfetto/perfetto/perfetto.cc +@@ -14,6 +14,8 @@ + // + // This file is automatically generated by gen_amalgamated. Do not edit. + ++#include <sys/ucred.h> ++ + // gen_amalgamated: predefined macros + #if !defined(PERFETTO_IMPLEMENTATION) + #define PERFETTO_IMPLEMENTATION +@@ -42125,7 +42127,7 @@ ClockSnapshotVector CaptureClockSnapshots() { + {0, 0}}, + {CLOCK_REALTIME, protos::pbzero::BUILTIN_CLOCK_REALTIME, {0, 0}}, + {CLOCK_MONOTONIC, protos::pbzero::BUILTIN_CLOCK_MONOTONIC, {0, 0}}, +- {CLOCK_MONOTONIC_RAW, ++ {CLOCK_MONOTONIC, + protos::pbzero::BUILTIN_CLOCK_MONOTONIC_RAW, + {0, 0}}, + }; +@@ -58913,8 +58915,8 @@ void UnixSocket::ReadPeerCredentialsPosix() { + int res = getpeereid(fd, &peer_uid_, nullptr); + PERFETTO_CHECK(res == 0); + // There is no pid when obtaining peer credentials for QNX +-#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#elif !defined(__FreeBSD__) && (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) + struct ucred user_cred; + socklen_t len = sizeof(user_cred); + int fd = sock_raw_.fd(); +@@ -58922,7 +58924,7 @@ void UnixSocket::ReadPeerCredentialsPosix() { + PERFETTO_CHECK(res == 0); + peer_uid_ = user_cred.uid; + peer_pid_ = user_cred.pid; +-#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ++#elif defined(__FreeBSD__) || PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) + struct xucred user_cred; + socklen_t len = sizeof(user_cred); + int res = getsockopt(sock_raw_.fd(), 0, LOCAL_PEERCRED, &user_cred, &len); diff --git a/graphics/filament/files/patch-third__party_perfetto_perfetto_perfetto.h b/graphics/filament/files/patch-third__party_perfetto_perfetto_perfetto.h new file mode 100644 index 000000000000..a1c99bc6e26e --- /dev/null +++ b/graphics/filament/files/patch-third__party_perfetto_perfetto_perfetto.h @@ -0,0 +1,42 @@ +--- third_party/perfetto/perfetto/perfetto.h.orig 2025-07-15 17:16:00 UTC ++++ third_party/perfetto/perfetto/perfetto.h +@@ -34,6 +34,8 @@ + * limitations under the License. + */ + ++#include <pthread_np.h> ++ + // Generated by write_buildflag_header.py + + // fix_include_guards: off +@@ -129,10 +131,10 @@ + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 1 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 + #endif +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 +-#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 1 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 +@@ -1075,7 +1077,7 @@ inline TimeNanos GetWallTimeRawNs() { + } + + inline TimeNanos GetWallTimeRawNs() { +- return GetTimeInternalNs(CLOCK_MONOTONIC_RAW); ++ return GetTimeInternalNs(CLOCK_MONOTONIC); + } + + inline TimeNanos GetThreadCPUTimeNs() { +@@ -8167,7 +8169,7 @@ inline PlatformThreadId GetThreadId() { + #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) + using PlatformThreadId = pid_t; + inline PlatformThreadId GetThreadId() { +- return static_cast<pid_t>(syscall(__NR_gettid)); ++ return static_cast<pid_t>(pthread_getthreadid_np()); + } + #elif PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA) + using PlatformThreadId = zx_koid_t; |