Update Pre-compiling SPIR-V binaries section

Describe the default settings for precompiled SPIR-V binaries
and the option to change the defaults.

Components: Vulkan

VK-GL-CTS issue: 269

Change-Id: I0ba09a9f03d5b2dc76a356e71dfe4431fba67b2b

diff --git a/external/vulkancts/README.md b/external/vulkancts/README.md
index 5bbe505..392d0c4 100644 (file)
--- a/external/vulkancts/README.md
+++ b/external/vulkancts/README.md
@@ -124,6 +124,12 @@ SPIR-V binaries can be pre-built with following command:
 
        python external/vulkancts/scripts/build_spirv_binaries.py
 
+By default the script builds SPIR-V binaries for Vulkan 1.1.
+Binaries for other Vulkan versions can be requested by supplying
+an extra command line option:
+
+       python external/vulkancts/scripts/build_spirv_binaries.py --target-vulkan-version <Vulkan version>
+
 Binaries will be written to `external/vulkancts/data/vulkan/prebuilt/`.
 
 Test modules (or in case of Android, the APK) must be re-built after building

diff --git a/external/vulkancts/scripts/build_spirv_binaries.py b/external/vulkancts/scripts/build_spirv_binaries.py
index d50219d..39dbe77 100644 (file)
--- a/external/vulkancts/scripts/build_spirv_binaries.py
+++ b/external/vulkancts/scripts/build_spirv_binaries.py
@@ -44,7 +44,6 @@ VULKAN_MODULE         = Module("dEQP-VK", "../external/vulkancts/modules/vulkan", "deqp
 DEFAULT_BUILD_DIR      = os.path.join(tempfile.gettempdir(), "spirv-binaries", "{targetName}-{buildType}")
 DEFAULT_TARGET         = "null"
 DEFAULT_DST_DIR                = os.path.join(DEQP_DIR, "external", "vulkancts", "data", "vulkan", "prebuilt")
-DEFAULT_VULKAN_VERSION = "1.1"
 
 def getBuildConfig (buildPathPtrn, targetName, buildType):
        buildPath = buildPathPtrn.format(
@@ -98,7 +97,8 @@ def parseArgs ():
        parser.add_argument("-u",
                                                "--target-vulkan-version",
                                                dest="vulkanVersion",
-                                               default=DEFAULT_VULKAN_VERSION,
+                                               default="1.1",
+                                               choices=["1.0", "1.1"],
                                                help="Target Vulkan version")
        return parser.parse_args()