ソースを参照

Add support for a new android's 3p vulkan validaiton lib (#213)

* Add support for a new android's 3p vulkan validaiton lib

Signed-off-by: moudgils <[email protected]>

* Addressed feedback

Signed-off-by: moudgils <[email protected]>

* Update package-system/vulkan-validationlayers/Findvulkan-validationlayers.cmake

Co-authored-by: lumberyard-employee-dm <[email protected]>
Signed-off-by: moudgils <[email protected]>

---------

Signed-off-by: moudgils <[email protected]>
Co-authored-by: lumberyard-employee-dm <[email protected]>
moudgils 1 年間 前
コミット
025ebab1ca

+ 6 - 1
package-system/vulkan-validationlayers/Findvulkan-validationlayers.cmake

@@ -16,9 +16,14 @@ endif()
 set(PATH_TO_DLL ${CMAKE_CURRENT_LIST_DIR}/vulkan-validationlayers/lib/release)
 
 set(_DLL_NAME ${PATH_TO_DLL}/${CMAKE_SHARED_LIBRARY_PREFIX}VkLayer_khronos_validation${CMAKE_SHARED_LIBRARY_SUFFIX})
-set(${MY_NAME}_RUNTIME_JSON_DEPENDENCIES ${PATH_TO_DLL}/VkLayer_khronos_validation.json)
+if (${PAL_PLATFORM_NAME} STREQUAL "Windows")
+    set(${MY_NAME}_RUNTIME_JSON_DEPENDENCIES ${PATH_TO_DLL}/VkLayer_khronos_validation.json)
+else()
+    set(${MY_NAME}_RUNTIME_JSON_DEPENDENCIES "")
+endif()
 
 add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) 
+
 ly_add_target_files(
     TARGETS
     ${TARGET_WITH_NAMESPACE}

+ 11 - 1
package-system/vulkan-validationlayers/build_config.json

@@ -20,7 +20,17 @@
                 "custom_install_cmd": [
                     "install_vulkan_validation_windows.cmd"
                 ]
-            }
+            },
+            "Android":{
+                "additional_download_packages":[
+                  [ "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/sdk-1.3.261.0/android-binaries-sdk-1.3.261.0-android.zip", "28392f898378636eac76d78b1e18260b91b9688cbfe7b5b264b52a9136ea69c1", "sha256" ]
+                ],
+                "cmake_find_source":"Findvulkan-validationlayers.cmake",
+                "cmake_find_target":"Findvulkan-validationlayers.cmake",   
+                "custom_install_cmd": [
+                    "install_vulkan_validation_android.cmd"
+                ]
+            } 
         },
         "Linux":{
             "Linux":{

+ 2 - 0
package_build_list_host_windows.json

@@ -60,6 +60,7 @@
         "tiff-4.2.0.15-rev4-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Android --package-root ../../package-system --clean",
         "v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd/build_package_image.py --platform-name windows",
         "vulkan-validationlayers-1.3.261-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/vulkan-validationlayers --platform-name Windows --package-root ../../package-system --clean",
+        "vulkan-validationlayers-1.3.261-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/vulkan-validationlayers --platform-name Android --package-root ../../package-system --clean",
         "zlib-1.2.11-rev5-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Android --package-root ../../package-system --clean",
         "zlib-1.2.11-rev5-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Windows --package-root ../../package-system --clean"
   },
@@ -130,6 +131,7 @@
     "tiff-4.2.0.15-rev4-android": "package-system/tiff-android",
     "v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd-windows",
     "vulkan-validationlayers-1.3.261-rev1-windows": "package-system/vulkan-validationlayers-windows",
+    "vulkan-validationlayers-1.3.261-rev1-android": "package-system/vulkan-validationlayers-android",
     "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
     "zlib-1.2.11-rev5-android": "package-system/zlib-android",
     "zlib-1.2.11-rev5-windows": "package-system/zlib-windows",