Merge pull request #68 from GeniusVentures/dev_checkvulk

Fix issues with vulkan build.
GeniusVentures · Nov 30, 2024 · 0c08682 · 0c08682
2 parents 079dcdd + e21db0c
commit 0c08682
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 11 deletions.
diff --git a/MNN b/MNN
diff --git a/Vulkan-Headers b/Vulkan-Headers
diff --git a/Vulkan-Loader b/Vulkan-Loader
diff --git a/build/CommonTargets.CMake b/build/CommonTargets.CMake
@@ -344,7 +344,15 @@ set(_FINDPACKAGE_libp2p_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/libp2p/lib/cmake
 set(_FINDPACKAGE_libp2p_LIBRARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/libp2p/lib")
 set(_FINDPACKAGE_LIBP2P_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libp2p/include")
 
-if(NOT ANDROID AND NOT IOS)
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(IS_APPLE_PLATFORM ON)
+    if(IOS)
+        set(IS_IOS_PLATFORM ON)
+    else()
+        set(IS_MACOS_PLATFORM ON)
+    endif()
+endif()
+if(NOT ANDROID AND NOT IS_APPLE_PLATFORM)
     # Vulkan-Headers
     ExternalProject_Add(
         Vulkan-Headers
@@ -375,14 +383,12 @@ if(NOT ANDROID AND NOT IOS)
     set(ENV{VULKAN_SDK} "${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader")
     set(vulkanTarget Vulkan-Loader)
 endif()
+message(WARNING "MNN EXTRA ${_MNN_EXTRA_PARAM}")
 
-# MNN
 ExternalProject_Add(MNN
     PREFIX MNN
     SOURCE_DIR "${THIRDPARTY_DIR}/MNN"
-    CMAKE_GENERATOR ${CMAKE_GENERATOR}
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env VULKAN_SDK=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader
-    ${CMAKE_COMMAND} <SOURCE_DIR>
+    CMAKE_CACHE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DMNN_BUILD_SHARED_LIBS:BOOL=OFF
     -DMNN_BUILD_TESTS:BOOL=OFF
@@ -392,11 +398,30 @@ ExternalProject_Add(MNN
     -DMNN_WIN_RUNTIME_MT:BOOL=ON
     ${_CMAKE_COMMON_CACHE_ARGS}
     ${_MNN_EXTRA_PARAM}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build .
-    INSTALL_COMMAND ${CMAKE_COMMAND} --install .
     DEPENDS ${_MNN_DEPENDS} ${vulkanTarget}
 )
 
+# MNN
+# ExternalProject_Add(MNN
+#     PREFIX MNN
+#     SOURCE_DIR "${THIRDPARTY_DIR}/MNN"
+#     CMAKE_GENERATOR ${CMAKE_GENERATOR}
+#     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env VULKAN_SDK=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader
+#     ${CMAKE_COMMAND} <SOURCE_DIR>
+#     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+#     -DMNN_BUILD_SHARED_LIBS:BOOL=OFF
+#     -DMNN_BUILD_TESTS:BOOL=OFF
+#     -DMNN_BUILD_TOOLS:BOOL=OFF
+#     -DMNN_BUILD_PROTOBUFFER:BOOL=OFF
+#     -DMNN_VULKAN:BOOL=ON
+#     -DMNN_WIN_RUNTIME_MT:BOOL=ON
+#     ${_CMAKE_COMMON_CACHE_ARGS}
+#     ${_MNN_EXTRA_PARAM}
+#     BUILD_COMMAND ${CMAKE_COMMAND} --build .
+#     INSTALL_COMMAND ${CMAKE_COMMAND} --install .
+#     DEPENDS ${_MNN_DEPENDS} ${vulkanTarget}
+# )
+
 set(_FINDPACKAGE_MNN_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/MNN/lib/cmake/MNN")
 set(_FINDPACKAGE_MNN_LIBRARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/MNN/lib")
 set(_FINDPACKAGE_MNN_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/MNN/include")

diff --git a/build/Linux/CMakeLists.txt b/build/Linux/CMakeLists.txt
@@ -57,6 +57,8 @@ set(_ED25519_RANDOM dev_urandom)
 set(_MNN_EXTRA_PARAM
     -DMNN_USE_SYSTEM_LIB:BOOL=ON 
     -DMNN_SEP_BUILD:BOOL=OFF
+    -DVulkan_INCLUDE_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader/include
+    -DVulkan_LIBRARY:PATH=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader/lib/libvulkan.so
 )
 
 

diff --git a/libp2p b/libp2p
+8 −0		.gitattributes
+0 −2		.github/ISSUE_TEMPLATE/bug_report.md
+12 −0		.github/dependabot.yml
+0 −2		.github/pull_request_template.md
+83 −0		.github/workflows/ci.yml
+0 −60		.github/workflows/linux.yml
+8 −0		.gitignore
+15 −0		.reuse/dep5
+13 −14		BUILD.gn
+6 −2		BUILD.md
+54 −43		CMakeLists.txt
+10 −0		CODE_OF_CONDUCT.adoc
+0 −1		CODE_OF_CONDUCT.md
+7 −2		CONTRIBUTING.md
+0 −99		INTEGRATION.md
+18 −0		LICENSE.md
+0 −0		LICENSES/Apache-2.0.txt
+9 −0		LICENSES/MIT.txt
+108 −0		Makefile.release
+29 −6		README.md
+11 −0		SECURITY.md
+0 −5		cmake/VulkanHeadersConfig.cmake.in
+394 −0		include/vk_video/vulkan_video_codec_av1std.h
+109 −0		include/vk_video/vulkan_video_codec_av1std_decode.h
+143 −0		include/vk_video/vulkan_video_codec_av1std_encode.h
+4 −2		include/vk_video/vulkan_video_codec_h264std.h
+4 −2		include/vk_video/vulkan_video_codec_h264std_decode.h
+36 −30		include/vk_video/vulkan_video_codec_h264std_encode.h
+9 −6		include/vk_video/vulkan_video_codec_h265std.h
+4 −2		include/vk_video/vulkan_video_codec_h265std_decode.h
+58 −51		include/vk_video/vulkan_video_codec_h265std_encode.h
+6 −1		include/vk_video/vulkan_video_codecs_common.h
+5 −19		include/vulkan/vk_icd.h
+4 −18		include/vulkan/vk_layer.h
+1 −1		include/vulkan/vk_platform.h
+5,145 −0		include/vulkan/vulkan.cppm
+1 −1		include/vulkan/vulkan.h
+14,082 −8,688		include/vulkan/vulkan.hpp
+29 −1		include/vulkan/vulkan_android.h
+161 −427		include/vulkan/vulkan_beta.h
+8,974 −5,135		include/vulkan/vulkan_core.h
+2 −1		include/vulkan/vulkan_directfb.h
+2,717 −1,439		include/vulkan/vulkan_enums.hpp
+3,293 −0		include/vulkan/vulkan_extension_inspection.hpp
+74 −19		include/vulkan/vulkan_format_traits.hpp
+5 −1		include/vulkan/vulkan_fuchsia.h
+11,457 −4,771		include/vulkan/vulkan_funcs.hpp
+3 −1		include/vulkan/vulkan_ggp.h
+7,898 −4,075		include/vulkan/vulkan_handles.hpp
+4,126 −604		include/vulkan/vulkan_hash.hpp
+326 −0		include/vulkan/vulkan_hpp_macros.hpp
+2 −1		include/vulkan/vulkan_ios.h
+2 −1		include/vulkan/vulkan_macos.h
+9 −7		include/vulkan/vulkan_metal.h
+9,994 −5,746		include/vulkan/vulkan_raii.hpp
+55 −1		include/vulkan/vulkan_screen.h
+1,159 −0		include/vulkan/vulkan_shared.hpp
+2,044 −232		include/vulkan/vulkan_static_assertions.hpp
+61,581 −34,448		include/vulkan/vulkan_structs.hpp
+1,750 −475		include/vulkan/vulkan_to_string.hpp
+2 −1		include/vulkan/vulkan_vi.h
+3,716 −0		include/vulkan/vulkan_video.hpp
+2 −1		include/vulkan/vulkan_wayland.h
+10 −1		include/vulkan/vulkan_win32.h
+2 −1		include/vulkan/vulkan_xcb.h
+2 −1		include/vulkan/vulkan_xlib.h
+2 −1		include/vulkan/vulkan_xlib_xrandr.h
+13 −3		registry/apiconventions.py
+17 −10		registry/cgenerator.py
+87 −14		registry/generator.py
+0 −816		registry/genvk.py
+101 −51		registry/parse_dependency.py
+149 −140		registry/profiles/VP_KHR_roadmap.json
+264 −17		registry/reg.py
+117 −8		registry/spec_tools/conventions.py
+1 −1		registry/spec_tools/util.py
+2 −2		registry/stripAPI.py
+74,557 −42,201		registry/validusage.json
+705 −69		registry/video.xml
+6,094 −1,312		registry/vk.xml
+37 −5		registry/vkconventions.py
+26 −39		tests/CMakeLists.txt
+0 −32		tests/find_package/CMakeLists.txt
+73 −0		tests/integration/CMakeLists.txt
+10 −2		tests/vk_icd.c
+10 −2		tests/vk_layer.c