Integrate VisionOS platform

Author: MikhailGorobets

CMakeLists.txt

@@ -8,7 +8,7 @@ set(DILIGENT_TOOLS_FOUND TRUE CACHE INTERNAL "DiligentTools module is found")
 
 file(RELATIVE_PATH DILIGENT_TOOLS_DIR "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
 
-if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_WEB)
+if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_VISIONOS OR PLATFORM_WEB)
     option(DILIGENT_INSTALL_TOOLS "Install DiligentTool module headers and libraries" ON)
 else()
     set(DILIGENT_INSTALL_TOOLS OFF)
@@ -50,7 +50,11 @@ add_subdirectory(ThirdParty)
 add_subdirectory(TextureLoader)
 add_subdirectory(AssetLoader)
 add_subdirectory(Imgui)
-add_subdirectory(NativeApp)
+if(NOT PLATFORM_VISIONOS)
+    # visionOS samples (Tutorial30_HelloVisionOS) ship their own UIKit scene
+    # delegates and entry point; NativeAppBase has no visionOS implementation.
+    add_subdirectory(NativeApp)
+endif()
 
 if((PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS) AND GL_SUPPORTED)
     add_subdirectory(HLSL2GLSLConverter)

NativeApp/include/NativeAppBase.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2026 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");

ThirdParty/CMakeLists.txt

@@ -42,8 +42,8 @@ if (NOT TARGET PNG::PNG)
     set(PNG_TESTS OFF CACHE BOOL "Build libpng tests")
     set(SKIP_INSTALL_ALL ON)
     set(PNG_FRAMEWORK OFF)
-    if(PLATFORM_TVOS)
-        # libpng does not support tvOS, but it does support iOS, so we can use the iOS target
+    if(PLATFORM_TVOS OR PLATFORM_VISIONOS)
+        # libpng does not support tvOS/visionOS, but it does support iOS, so we can use the iOS target
         set(IOS TRUE)
     endif()
     add_subdirectory(libpng)

ThirdParty/libtiff/CMakeLists.txt

@@ -47,7 +47,7 @@ set(SOURCE
 
 if(PLATFORM_WIN32)
     list(APPEND SOURCE tif_win32.c)
-elseif(PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_WEB)
+elseif(PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_VISIONOS OR PLATFORM_WEB)
     list(APPEND SOURCE tif_unix.c)
 else()
     message(FATAL_ERROR "Unknown platform")

ThirdParty/libtiff/tif_config.h

@@ -10,7 +10,7 @@
 
 #   include "tif_config.android.h"
 
-#elif PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_WEB
+#elif PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_VISIONOS || PLATFORM_WEB
 
 #   include "tif_config.linux.h"
 

ThirdParty/libtiff/tiffconf.h

@@ -6,7 +6,7 @@
 #       include "tiffconf.linux.h"
 #   endif
 
-#elif PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_WEB
+#elif PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_VISIONOS || PLATFORM_WEB
 
 #   include "tiffconf.linux.h"
 

ThirdParty/zlib.cmake

@@ -44,7 +44,7 @@ set_common_target_properties(ZLib)
 # Using target_compile_options() adds it before options of the linked libraries.
 target_link_libraries(ZLib PRIVATE Diligent-BuildSettings NO_WERROR)
 
-if(PLATFORM_LINUX OR PLATFORM_ANDROID OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_WEB)
+if(PLATFORM_LINUX OR PLATFORM_ANDROID OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_VISIONOS OR PLATFORM_WEB)
     target_compile_definitions(ZLib PRIVATE HAVE_UNISTD_H)
 endif()