Require Python 3 as some components used by the CTS already need it.
Update SPIR-V Tools: Fixes build issues on Windows and OpUnreachable validation.
Components: Framework, AOSP, Vulkan, OpenGL
Affects: dEQP-VK.*, builds
VK-GL-CTS issue: 1665
VK-GL-CTS issue: 1627
VK-GL-CTS issue: 1716
Change-Id: I719574b50aa16fdb0d06e85981a029ae8e0c4416
(cherry picked from commit
b1e5e376ccb021339741c927f99d9c2378ecc6cc)
cmake_minimum_required(VERSION 2.8.2)
find_package(Git)
-find_package(PythonInterp 2)
+find_package(PythonInterp 3)
# dEQP Target.
set(DEQP_TARGET "default" CACHE STRING "dEQP Target (default, android...)")
GitRepo(
"https://github.com/KhronosGroup/SPIRV-Tools.git",
None,
- "fcb8453104508b61b67f88ba0cb7c5bfdb49adb7",
+ "d754b70592ca98d0bfcffcd16ec504bdca8513d4",
"spirv-tools"),
GitRepo(
"https://github.com/KhronosGroup/glslang.git",
The conformance tests come with native Android support. The following packages
are needed in order to build an Android binary:
-- Python 2.7.x
+- Python 3.x (for the build related scripts, some other scripts still use Python 2.7.x)
- Android NDK r17c
- Android SDK with API 28 packages and tools installed
- Apache Ant
The following tools must be installed and present in the PATH variable:
* Git (for checking out sources)
- * Python 2.7.x (all recent versions in 2.x should work, 3.x is not supported)
+ * Python 3.x (for the build related scripts, some other scripts still use Python 2.7.x)
* CMake 2.8 (3.6 for Android NDK r17+ builds) or newer
### Win32