From d4f887ac2945b5c43b0623f450e0e7a88bc356be Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Tue, 10 Oct 2017 09:36:18 +0200 Subject: [PATCH] Update Vulkan README Update references to the mustpass location, parameterize package name. Components: Vulkan VK-GL-CTS issue: 759 Change-Id: I4f15a1aa5eb54ad4b11e3b7a3a5a391fe81b9dac --- external/vulkancts/README.md | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/external/vulkancts/README.md b/external/vulkancts/README.md index e53d2f2..361a8d9 100644 --- a/external/vulkancts/README.md +++ b/external/vulkancts/README.md @@ -84,8 +84,7 @@ Following command will build dEQP.apk: python scripts/android/build_apk.py --sdk --ndk By default the CTS package will be built for the Android API level 21 (Android 5.0 and above). -Certain tests, for example tests for VK_ANDROID_external_memory_android_hardware_buffer, may -require more recent API levels. A required API level may be supplied using --native-api command line option. +Another API level may be supplied using --native-api command line option. The package can be installed by either running: @@ -105,7 +104,7 @@ Building Mustpass Current mustpass is checked into repository and can be found at: - external/vulkancts/mustpass/1.0.2/vk-default.txt + external/vulkancts/mustpass/1.1.0/vk-default.txt Vulkan CTS mustpass can be re-generated by running: @@ -137,7 +136,7 @@ Running CTS Following command line options MUST be used when running CTS: - --deqp-caselist-file=/external/vulkancts/mustpass/1.0.2/vk-default.txt + --deqp-caselist-file=/external/vulkancts/mustpass/1.1.0/vk-default.txt --deqp-log-images=disable --deqp-log-shader-sources=disable @@ -172,7 +171,7 @@ Test log will be written into TestResults.qpa ### Android - adb push /external/vulkancts/mustpass/1.0.2/vk-default.txt /sdcard/vk-default.txt + adb push /external/vulkancts/mustpass/1.1.0/vk-default.txt /sdcard/vk-default.txt adb shell In device shell: @@ -235,16 +234,20 @@ if `vk::Platform::describePlatform()` is implemented. If the submission package covers multiple products, you can list them by appending additional `PRODUCT:` lines to the conformance statement. For example: - CONFORM_VERSION: vulkan-cts-1.0.2.0 + CONFORM_VERSION: vulkan-cts-1.1.0.0 PRODUCT: Product A PRODUCT: Product B ... The actual submission package consists of the above set of files which must -be bundled into a gzipped tar file named `VK10_<_info>.tgz`. `` -is the name of the Adopting member company, or some recognizable abbreviation. +be bundled into a gzipped tar file named `VK_<_info>.tgz`. +`` is the major version of the Vulkan API specification, ``is the minor +version of the Vulkan API specification. +`` is the name of the Adopting member company, or some recognizable abbreviation. The `<_info>` field is optional. It may be used to uniquely identify a submission by OS, platform, date, or other criteria when making multiple submissions. +For example, a company XYZ may make a submission for a Vulkan 1.1 implementation named +`VK11_XYZ_PRODUCTA_Windows10.tgz` One way to create a suiteable gzipped tar file is to execute the command: @@ -298,7 +301,7 @@ Submission package can be verified using `external/vulkancts/scripts/verify_subm script. The script takes two arguments: path to extracted submission package and path to current mustpass list. For example: - python external/vulkancts/scripts/verify_submission.py VK_10_Khronos_1/ external/vulkancts/mustpass/1.0.2/vk-default.txt + python external/vulkancts/scripts/verify_submission.py VK_11_Khronos_1/ external/vulkancts/mustpass/1.1.0/vk-default.txt Vulkan platform port -- 2.7.4