FreeBSD patches.

google · Sep 9, 2022 · 4116414 · 4116414
1 parent cd58d39
commit 4116414
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/filament/backend/src/Platform.cpp b/filament/backend/src/Platform.cpp
@@ -41,7 +41,7 @@
     #if defined(FILAMENT_DRIVER_SUPPORTS_VULKAN)
         #include "vulkan/PlatformVkCocoa.h"
     #endif
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
     #if defined(FILAMENT_SUPPORTS_WAYLAND)
         #if defined (FILAMENT_DRIVER_SUPPORTS_VULKAN)
             #include "vulkan/PlatformVkLinuxWayland.h"
@@ -119,7 +119,7 @@ DefaultPlatform* DefaultPlatform::create(Backend* backend) noexcept {
                 return new PlatformVkAndroid();
             #elif defined(IOS)
                 return new PlatformVkCocoaTouch();
-            #elif defined(__linux__)
+            #elif defined(__linux__) || defined(__FreeBSD__)
                 #if defined(FILAMENT_SUPPORTS_WAYLAND)
                     return new PlatformVkLinuxWayland();
                 #elif defined(FILAMENT_SUPPORTS_X11)
@@ -154,7 +154,7 @@ DefaultPlatform* DefaultPlatform::create(Backend* backend) noexcept {
             return new PlatformCocoaTouchGL();
         #elif defined(__APPLE__)
             return new PlatformCocoaGL();
-        #elif defined(__linux__)
+        #elif defined(__linux__) || defined(__FreeBSD__)
             #if defined(FILAMENT_SUPPORTS_X11)
                 return new PlatformGLX();
             #elif defined(FILAMENT_SUPPORTS_EGL_ON_LINUX)

diff --git a/libs/bluevk/include/vulkan/vk_platform.h b/libs/bluevk/include/vulkan/vk_platform.h
@@ -25,7 +25,7 @@
 #define VK_USE_PLATFORM_ANDROID_KHR 1
 #elif defined(IOS)
 #define VK_USE_PLATFORM_IOS_MVK 1
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
 #if defined(FILAMENT_SUPPORTS_XCB)
 #define VK_USE_PLATFORM_XCB_KHR 1
 #endif

diff --git a/libs/bluevk/src/BlueVKLinuxAndroid.cpp b/libs/bluevk/src/BlueVKLinuxAndroid.cpp
@@ -42,7 +42,7 @@ bool loadLibrary() {
         path = FILAMENT_VKLIBRARY_PATH;
 #elif defined(__ANDROID__)
         path = "libvulkan.so";
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
         path = "libvulkan.so.1";
 #else
 #error "This file should only be compiled for Android or Linux"

diff --git a/libs/utils/CMakeLists.txt b/libs/utils/CMakeLists.txt
@@ -81,8 +81,10 @@ if (ANDROID)
     list(APPEND SRCS src/android/ThermalManager.cpp)
 endif()
 if (LINUX OR ANDROID)
-    list(APPEND SRCS src/linux/Condition.cpp)
-    list(APPEND SRCS src/linux/Mutex.cpp)
+    if (NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+        list(APPEND SRCS src/linux/Condition.cpp)
+        list(APPEND SRCS src/linux/Mutex.cpp)
+    endif()
     list(APPEND SRCS src/linux/Path.cpp)
 endif()
 if (APPLE)

diff --git a/third_party/libsdl2/include/SDL_config.h b/third_party/libsdl2/include/SDL_config.h
@@ -41,7 +41,7 @@
 #include "SDL_config_android.h"
 #elif defined(__PSP__)
 #include "SDL_config_psp.h"
-#elif defined(__LINUX__)
+#elif defined(__LINUX__) || defined(__FreeBSD__)
 #if defined(FILAMENT_SUPPORTS_WAYLAND)
 #include "SDL_config_linux_wayland.h"
 #elif defined(FILAMENT_SUPPORTS_X11)