Manually copy dEQP data files to output directory

dEQP has data files that live in several directories within dEQP's source tree. For example, GLES3 has data files that live within: data/gles3/data/ external/graphicsfuzz/data/gles3/ However, we can only tell dEQP about a single data directory during initialization of dEQP. To get around this, we are manually copying all of the necessary data files to the output generated files directory and pointing dEQP to this single directory. This also helps us solve a second problem related to the paths that dEQP uses when accessing graphicsfuzz data files. For the graphicsfuzz tests, dEQP will attempt to open the necessary shaders by accessing them with the path: data/gles3/graphicsfuzz/ However, those files would normally live at the path that matches their location within the source tree: external/graphicsfuzz/data/gles3/graphicsfuzz/ As part of the manual copy of these data files, we are also able to strip the extra 'external/graphicsfuzz/' portion of the path. Bug: angleproject:2322 Test: dEQP Change-Id: Ibc96442c221485e2f246890fa8fe51f090c5e222 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1881759 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: Tim Van Patten <timvp@google.com>

Manually copy dEQP data files to output directory
11c487a8 · Tim Van Patten · Commit Bot · 1a01b4b3 · 11c487a8 · 11c487a8
Commit 11c487a8 authored Oct 25, 2019 by Tim Van Patten Committed by Commit Bot Nov 14, 2019
8 changed files
--- a/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
+++ b/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
+{
+  "scripts/gen_vk_gl_cts_build.py":
+    "cda74c2ddbb1e1a2e2f97eb1e5ea2569",
+  "src/tests/deqp_support/BUILD.gn":
+    "aad3f3da4bd365ad06609538cdb615f6",
+  "src/tests/deqp_support/deqp_data_autogen.gni":
+    "30ae29be893ff538b0b4c5119647c132",
+  "third_party/VK-GL-CTS/src/CMakeLists.txt":
+    "b82006c8b9ee20ce702d410121ac809d",
+  "third_party/VK-GL-CTS/src/execserver/CMakeLists.txt":
+    "38aa187592e6ef9a331fc1ea313fc68d",
+  "third_party/VK-GL-CTS/src/executor/CMakeLists.txt":
+    "c160665aff880be214feba6813ed1687",
+  "third_party/VK-GL-CTS/src/external/amber/CMakeLists.txt":
+    "f83a418b79863e90de781d8be6515246",
+  "third_party/VK-GL-CTS/src/external/glslang/CMakeLists.txt":
+    "323b44bb52b08f5a937d6e7827667d34",
+  "third_party/VK-GL-CTS/src/external/libpng/CMakeLists.txt":
+    "f0a31a5d1edcf912eea4668abf8c9c27",
+  "third_party/VK-GL-CTS/src/external/openglcts/CMakeLists.txt":
+    "fefc76d843831c4778fb4f8877f63f04",
+  "third_party/VK-GL-CTS/src/external/openglcts/modules/CMakeLists.txt":
+    "9852754780cd9522f93644d2d99b271d",
+  "third_party/VK-GL-CTS/src/external/openglcts/modules/common/CMakeLists.txt":
+    "d220542a9e60c717cb3d7211f93440d3",
+  "third_party/VK-GL-CTS/src/external/openglcts/modules/common/subgroups/CMakeLists.txt":
+    "e44d868c9076a92806cd27c06da23698",
+  "third_party/VK-GL-CTS/src/external/openglcts/modules/gl/CMakeLists.txt":
+    "c74b485c5ca3618e38353423255f64a3",
+  "third_party/VK-GL-CTS/src/external/openglcts/modules/gles2/CMakeLists.txt":
+    "5ac63dce60849bf12e3ab2dde99424ab",
+  "third_party/VK-GL-CTS/src/external/openglcts/modules/gles3/CMakeLists.txt":
+    "52c1da36cb9ef14ef877412c74bdf8a1",
+  "third_party/VK-GL-CTS/src/external/openglcts/modules/gles31/CMakeLists.txt":
+    "496adbd5a76701e3e8653a62805075a7",
+  "third_party/VK-GL-CTS/src/external/openglcts/modules/gles32/CMakeLists.txt":
+    "f2e02e3f357ad23b037f028efb744fe4",
+  "third_party/VK-GL-CTS/src/external/openglcts/modules/glesext/CMakeLists.txt":
+    "ebdfbd0182b8bf2ea46d1b7e296c817f",
+  "third_party/VK-GL-CTS/src/external/openglcts/modules/runner/CMakeLists.txt":
+    "b26de93a406529b4fdc302847420eb8d",
+  "third_party/VK-GL-CTS/src/external/spirv-tools/CMakeLists.txt":
+    "cca8b4b984c40afb9880d177d53623a1",
+  "third_party/VK-GL-CTS/src/external/vulkancts/framework/vulkan/CMakeLists.txt":
+    "0e8f1b535e3ffa70cc6b52c548da3349",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/CMakeLists.txt":
+    "05e04841f6512297f49c9d642649f421",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/amber/CMakeLists.txt":
+    "86cb03a771d5c0a57a6e0dbb305c2aba",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/api/CMakeLists.txt":
+    "60ff0fa2b6467129cad3057f39a87d79",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/binding_model/CMakeLists.txt":
+    "794d2fffb0ac6da4f97bdb97ef241239",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/clipping/CMakeLists.txt":
+    "6af40d2325a8cd6b15a22f68888a36d4",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/compute/CMakeLists.txt":
+    "9e1e69ca5b8051bbf7ba0472a7f847e8",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/conditional_rendering/CMakeLists.txt":
+    "6acfaa2670c4cb02fa1d22d254ad59c4",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/descriptor_indexing/CMakeLists.txt":
+    "a2a03fd9269321fde9013d31f9685e01",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/device_group/CMakeLists.txt":
+    "6f9fe60553924ea0fe38b8e660fbdc5c",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/draw/CMakeLists.txt":
+    "de49df93bf553783ae240f9794fffc0d",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/dynamic_state/CMakeLists.txt":
+    "ba2bba86426f1dc9eb16bccc2df60111",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/fragment_ops/CMakeLists.txt":
+    "4e51584a591b57ea7ba21732e7658e21",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/fragment_shader_interlock/CMakeLists.txt":
+    "466928c89408546d4b34b5600d45bfa6",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/geometry/CMakeLists.txt":
+    "ea6d6d378737311f541c79d03396dc79",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/image/CMakeLists.txt":
+    "5ebff6a7a4a87834025784221f232dd2",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/imageless_framebuffer/CMakeLists.txt":
+    "9f2167a87844c1c5197d9ccb8863a613",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/memory/CMakeLists.txt":
+    "6eebdaaecb4bf9a7fe4ed42994ac873c",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/memory_model/CMakeLists.txt":
+    "0a30b3d9793d524ca3b2c01369a0f851",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/multiview/CMakeLists.txt":
+    "16a341e4f08e85adad6dbf0309883f5b",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt":
+    "c255130ecec0d0cde7e4060ebf3d4ae4",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/protected_memory/CMakeLists.txt":
+    "df800ce44dcb03d22810aa1ea988c8d2",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/query_pool/CMakeLists.txt":
+    "d2ecbb8b56f0f798def13dc990e7f054",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/rasterization/CMakeLists.txt":
+    "7244cc31e094426b44540c57a017beaa",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/renderpass/CMakeLists.txt":
+    "43bc3c4ac3832467c494a3c15026dbac",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/robustness/CMakeLists.txt":
+    "d0d524587e3083702cfe79643e9d827b",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/shaderexecutor/CMakeLists.txt":
+    "a60baf8dcc867380422d79959048adb2",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/shaderrender/CMakeLists.txt":
+    "0efe14bf15c96997c55df50fc29898c1",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/sparse_resources/CMakeLists.txt":
+    "bfaf070093d563e4dc92ec72d3e20d97",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt":
+    "0c997a25cbdf8f09b2a619b3269f0d15",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ssbo/CMakeLists.txt":
+    "957b7c45d94d652607833aeb007132c5",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/subgroups/CMakeLists.txt":
+    "bb621620038103d5e8f88de1714cefd7",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/synchronization/CMakeLists.txt":
+    "68fab755b6bdd9570fa311b6c8d809fb",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/tessellation/CMakeLists.txt":
+    "bd315c04bf5adb9f63e8c991fbde1e34",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/texture/CMakeLists.txt":
+    "7895df4abb5be71b92d3135e542b14bf",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/transform_feedback/CMakeLists.txt":
+    "e2e32f34bcd3cbbfce6c49a997f34934",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ubo/CMakeLists.txt":
+    "566bed92705fb01686aea784e4d058d3",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/util/CMakeLists.txt":
+    "fd82e3334d71e2b6ad9b126e7a910623",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/wsi/CMakeLists.txt":
+    "cb5e917d0ece533fb196c154209a7c38",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ycbcr/CMakeLists.txt":
+    "1c52b684259622de369aadbb5686a0e4",
+  "third_party/VK-GL-CTS/src/external/zlib/CMakeLists.txt":
+    "dae46a72968caa2df17a8d989dc43ec0",
+  "third_party/VK-GL-CTS/src/framework/CMakeLists.txt":
+    "b73b4bccc2a3d52c0db65d2d0e010828",
+  "third_party/VK-GL-CTS/src/framework/common/CMakeLists.txt":
+    "dc08a30095d0054cc67dd0fdab218e5e",
+  "third_party/VK-GL-CTS/src/framework/delibs/debase/CMakeLists.txt":
+    "136b8d2068c0920684582500843b3f88",
+  "third_party/VK-GL-CTS/src/framework/delibs/decpp/CMakeLists.txt":
+    "02fe34c7d8bc83be50cef7ac27c0772b",
+  "third_party/VK-GL-CTS/src/framework/delibs/deimage/CMakeLists.txt":
+    "688f12f6431595fd7a23a58bafa86964",
+  "third_party/VK-GL-CTS/src/framework/delibs/depool/CMakeLists.txt":
+    "f8c8af27fbf82656af87e71c90515225",
+  "third_party/VK-GL-CTS/src/framework/delibs/destream/CMakeLists.txt":
+    "887354432f1ebb2aacdb4c74ce56c591",
+  "third_party/VK-GL-CTS/src/framework/delibs/dethread/CMakeLists.txt":
+    "51e3c6eecf15ccfc7540755ac209cfb7",
+  "third_party/VK-GL-CTS/src/framework/delibs/deutil/CMakeLists.txt":
+    "ee7e21164a0152a3e362009513ca1fcf",
+  "third_party/VK-GL-CTS/src/framework/egl/CMakeLists.txt":
+    "ad3d1d711350899151b4f1a9ec55d561",
+  "third_party/VK-GL-CTS/src/framework/egl/wrapper/CMakeLists.txt":
+    "56b5fe404103a8f0f76d91fe4bd0070c",
+  "third_party/VK-GL-CTS/src/framework/opengl/CMakeLists.txt":
+    "933a8c72b6a43ee6288cd6568561699b",
+  "third_party/VK-GL-CTS/src/framework/opengl/simplereference/CMakeLists.txt":
+    "3bc65187d31db25fe6d862b6e1e64b16",
+  "third_party/VK-GL-CTS/src/framework/opengl/wrapper/CMakeLists.txt":
+    "31a7adfb6e907b53ef24bb6ea044b838",
+  "third_party/VK-GL-CTS/src/framework/platform/CMakeLists.txt":
+    "61165590822c668da40db99db8f2b45b",
+  "third_party/VK-GL-CTS/src/framework/qphelper/CMakeLists.txt":
+    "bff80adc305e9e5c527b1ad6db53e99f",
+  "third_party/VK-GL-CTS/src/framework/randomshaders/CMakeLists.txt":
+    "d1d59780829f01d4670492d21a931dfb",
+  "third_party/VK-GL-CTS/src/framework/referencerenderer/CMakeLists.txt":
+    "7ac17ce883289a4d9bf3c69bad5263b7",
+  "third_party/VK-GL-CTS/src/modules/CMakeLists.txt":
+    "632cf1d4d696b1e19c01c6d11e2d59c4",
+  "third_party/VK-GL-CTS/src/modules/egl/CMakeLists.txt":
+    "33553da10bfc7152294eb71a187f020f",
+  "third_party/VK-GL-CTS/src/modules/gles2/CMakeLists.txt":
+    "0282333aaa4560cd590c2562131c62e7",
+  "third_party/VK-GL-CTS/src/modules/gles2/accuracy/CMakeLists.txt":
+    "a6677806fdbde7ecb6c61aced41d4bed",
+  "third_party/VK-GL-CTS/src/modules/gles2/functional/CMakeLists.txt":
+    "7c30918f4517fe75af1c0681be2244a0",
+  "third_party/VK-GL-CTS/src/modules/gles2/performance/CMakeLists.txt":
+    "c62305ca30bf2a2af2d728ac8617bfce",
+  "third_party/VK-GL-CTS/src/modules/gles2/stress/CMakeLists.txt":
+    "32560174b5c5198e2572014c78d13e0c",
+  "third_party/VK-GL-CTS/src/modules/gles3/CMakeLists.txt":
+    "8b34b6a09f1de80536ea2ab2a983a65b",
+  "third_party/VK-GL-CTS/src/modules/gles3/accuracy/CMakeLists.txt":
+    "b7453385be34577f584259912a63e372",
+  "third_party/VK-GL-CTS/src/modules/gles3/functional/CMakeLists.txt":
+    "7d8722607ae8c774b477b5f6321e1614",
+  "third_party/VK-GL-CTS/src/modules/gles3/performance/CMakeLists.txt":
+    "7f59f06951811838d837912e366f1223",
+  "third_party/VK-GL-CTS/src/modules/gles3/stress/CMakeLists.txt":
+    "618e03b394cfc824a5114e7c0ac9843e",
+  "third_party/VK-GL-CTS/src/modules/gles31/CMakeLists.txt":
+    "15a891f0bc8a84415ac932deec54e77c",
+  "third_party/VK-GL-CTS/src/modules/gles31/functional/CMakeLists.txt":
+    "1743616165582d2b40922917fb24cb14",
+  "third_party/VK-GL-CTS/src/modules/gles31/stress/CMakeLists.txt":
+    "d7ce9c1931444d263a0af3dcc5a11090",
+  "third_party/VK-GL-CTS/src/modules/glshared/CMakeLists.txt":
+    "97bd9c51fa33d2231ff158a913e1e486",
+  "third_party/VK-GL-CTS/src/modules/internal/CMakeLists.txt":
+    "d30aedfe7a011730d2256a965d6867f4"
+}
\ No newline at end of file
--- a/scripts/gen_vk_gl_cts_build.py
+++ b/scripts/gen_vk_gl_cts_build.py
+#  Copyright 2019 The ANGLE Project Authors. All rights reserved.
+#  Use of this source code is governed by a BSD-style license that can be
+#  found in the LICENSE file.
+#
+#  Code generation for:
+#  - src/tests/deqp_support/BUILD.gn
+#  - src/tests/deqp_data.gni
+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
+
+import errno
+import os
+import sys
+import shutil
+
+
+def initDataDirectories(dataDirectories):
+    dataDirectories.append(os.path.join("data", "gles2"))
+    dataDirectories.append(os.path.join("data", "gles3"))
+    dataDirectories.append(os.path.join("data", "gles31"))
+    dataDirectories.append(os.path.join("external", "graphicsfuzz", "data", "gles3"))
+    dataDirectories.append(os.path.join("external", "openglcts", "data", "gles3"))
+
+
+def initPathReplacements(pathReplacements):
+    # The GraphicsFuzz data files need the 'external/graphicsfuzz/' prefix removed
+    pathToReplace = os.path.join("external", "graphicsfuzz", "")  # Include trailing slash
+    pathReplacements[pathToReplace] = ""
+    # The KHR dEQP tests expect a root prefix of "gl_cts" for some reason.
+    pathToReplace = os.path.join("external", "openglcts", "")  # Include trailing slash
+    pathReplacements[pathToReplace] = os.path.join("data", "gl_cts", "")
+
+
+def createBuildGnFile(buildGnPath):
+    # Cleanup the old file
+    if os.path.exists(buildGnPath):
+        os.remove(buildGnPath)
+    # Make the new one
+    return open(buildGnPath, "w+")
+
+
+def createGniFile(gniFilename):
+    # Cleanup the old file
+    if os.path.exists(gniFilename):
+        os.remove(gniFilename)
+    # Make the new one
+    return open(gniFilename, "w+")
+
+
+def writeFileHeader(fileIn):
+    templateFileHeader = """# GENERATED FILE - DO NOT EDIT.
+# Generated by: {script_name}
+#
+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""
+
+    fileHeader = templateFileHeader.format(script_name=os.path.basename(__file__))
+    fileIn.write(fileHeader)
+
+
+def fixDestinationDirectory(pathReplacements, relativeDirectory):
+    for pathReplacement in pathReplacements:
+        if pathReplacement in relativeDirectory:
+            return relativeDirectory.replace(pathReplacement, pathReplacements[pathReplacement])
+    return relativeDirectory
+
+
+def convertPathToVarName(path):
+    return path.replace(os.sep, "_")
+
+
+def getCMakeLists(deqpSrcDir):
+    cmakeLists = []
+    for root, directories, filenames in os.walk(deqpSrcDir):
+        for filename in filenames:
+            relativeDirectory = os.path.relpath(root, deqpSrcDir)
+            if filename == "CMakeLists.txt":
+                cmakeLists.append(os.path.join(relativeDirectory, filename))
+    return cmakeLists
+
+
+def main():
+    # List of directories containing data files
+    dataDirectories = []
+    # List of directories to exclude from the copy
+    excludedDirectories = [
+        ".git",
+    ]
+    # List of files to exclude from the copy
+    excludedFilenames = [
+        "LICENSE",
+    ]
+    # Dictionary of parts of paths that need to be replaced
+    # Key: Part of path to be replaced
+    # Value: What to replace it with
+    pathReplacements = {}
+    # List of unique relative directories for the copy() command outputs
+    relativeDirectories = []
+    # VK-GL-CTS source directory
+    deqpSourceDirectory = os.path.join("..", "third_party", "VK-GL-CTS", "src")
+    # Tests Directory
+    testsDirectory = os.path.join("..", "src", "tests")
+    # dEQP Support Directory
+    deqpSupportDirectory = "deqp_support"
+    # BUILD.gn file to write to
+    buildGnFilename = "BUILD.gn"
+    # Path to BUILD.gn
+    buildGnPath = os.path.join(testsDirectory, deqpSupportDirectory, buildGnFilename)
+    # dEQP data GNI File to write to
+    dataGniFilename = os.path.join(testsDirectory, deqpSupportDirectory, "deqp_data_autogen.gni")
+
+    # run_code_generation.py parameters.
+    if len(sys.argv) > 1:
+        # All CMakeLists.txt in the dEQP source tree (at the time)
+        cmakeDirs = getCMakeLists(deqpSourceDirectory)
+        inputs = [os.path.join(deqpSourceDirectory, "%s" % dir) for dir in cmakeDirs]
+        outputs = [dataGniFilename, buildGnPath]
+
+        if sys.argv[1] == 'inputs':
+            print(','.join(inputs))
+        elif sys.argv[1] == 'outputs':
+            print(','.join(outputs))
+        else:
+            print('Invalid script parameters')
+            return 1
+        return 0
+
+    deqpSrcDir = os.path.abspath(os.path.join(sys.path[0], deqpSourceDirectory))
+
+    initDataDirectories(dataDirectories)
+    initPathReplacements(pathReplacements)
+
+    dataFiles = []
+    for dataDir in dataDirectories:
+        dataPath = os.path.join(deqpSrcDir, dataDir)
+        for root, directories, filenames in os.walk(dataPath):
+            for filename in filenames:
+                relativeDirectory = os.path.relpath(root, deqpSrcDir)
+                # Skip any excluded directories
+                if any(directory in relativeDirectory for directory in excludedDirectories):
+                    continue
+                # Skip any excluded files
+                if any(excludedFilename in filename for excludedFilename in excludedFilenames):
+                    continue
+                # Record the relative directories and full paths to each data file
+                if relativeDirectory not in relativeDirectories:
+                    relativeDirectories.append(relativeDirectory)
+                dataFiles.append(os.path.join(relativeDirectory, filename))
+
+    dataFiles.sort()
+    relativeDirectories.sort()
+
+    #
+    # BUILD.gn
+    #
+    buildGnFile = createBuildGnFile(buildGnPath)
+    writeFileHeader(buildGnFile)
+    # Definitions
+    buildGnFile.write("deqp_path = \"../../../third_party/VK-GL-CTS/src\"\n")
+    # Create the copy() commands
+    templateFilesToCopy = """    "$deqp_path/{dataFile}",
+"""
+    templateCopyCommand = """
+copy("vk_gl_cts_data_{relDir}") {{
+  sources = [
+    {filesToCopy}
+  ]
+  outputs = [ "$root_gen_dir/vk_gl_cts_data/{destDir}/{{{{source_file_part}}}}" ]
+}}
+"""
+    for relativeDirectory in relativeDirectories:
+        filesToCopy = ""
+        for dataFile in dataFiles:
+            path, filename = os.path.split(dataFile)
+            if relativeDirectory == path:
+                filesToCopy += templateFilesToCopy.format(dataFile=dataFile)
+        copyCommand = ""
+        destDir = fixDestinationDirectory(pathReplacements, relativeDirectory)
+        copyCommand += templateCopyCommand.format(
+            relDir=convertPathToVarName(relativeDirectory),
+            filesToCopy=filesToCopy,
+            destDir=destDir)
+        buildGnFile.write(copyCommand)
+
+    #
+    # .gni
+    #
+    gniFile = createGniFile(dataGniFilename)
+    writeFileHeader(gniFile)
+    # Imports
+    templateImports = """import("deqp.gni")
+"""
+    gniFile.write(templateImports)
+    # Write the lists of data file dependencies
+    templateDataFiles = """  "$root_gen_dir/vk_gl_cts_data/{dataFile}",
+"""
+    templateDataFileDeps = """
+{dataDepName} = [
+{files}]
+"""
+    for dataDirectory in dataDirectories:
+        files = ""
+        for dataFile in dataFiles:
+            if dataDirectory + os.sep in dataFile:
+                files += templateDataFiles.format(
+                    dataFile=fixDestinationDirectory(pathReplacements, dataFile))
+        dataDepName = "angle_deqp_" + convertPathToVarName(dataDirectory)
+        fileDeps = templateDataFileDeps.format(dataDepName=dataDepName, files=files)
+        gniFile.write(fileDeps)
+
+    templateCopyTarget = """  "{deqpSupportDirectory}:vk_gl_cts_data_{relDir}",
+"""
+    templateCopyTargets = """
+angle_deqp_data_copy_targets = [
+{targets}]
+"""
+    targets = ""
+    for relativeDirectory in relativeDirectories:
+        targets += templateCopyTarget.format(
+            deqpSupportDirectory=deqpSupportDirectory,
+            relDir=convertPathToVarName(relativeDirectory))
+    gniFile.write(templateCopyTargets.format(targets=targets))
+
+
+if __name__ == '__main__':
+    sys.exit(main())
--- a/scripts/run_code_generation.py
+++ b/scripts/run_code_generation.py
@@ -117,6 +117,8 @@ generators = {
        'src/libANGLE/renderer/metal/gen_mtl_format_table.py',
    'Metal default shaders':
        'src/libANGLE/renderer/metal/shaders/gen_mtl_internal_shaders.py',
+    'GL CTS (dEQP) build files':
+        'scripts/gen_vk_gl_cts_build.py',
 }



--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -503,7 +503,8 @@ if (build_angle_gles1_conform_tests) {
 ###-----------------------------------------------------

 if (build_angle_deqp_tests && !is_fuchsia) {
-  import("deqp.gni")
+  import("deqp_support/deqp.gni")
+  import("deqp_support/deqp_data_autogen.gni")

  config("angle_deqp_support") {
    include_dirs = deqp_include_dirs
@@ -548,6 +549,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
      "QP_SUPPORT_PNG=1",
      "_HAS_EXCEPTIONS=1",
      "_MBCS",
+      "ANGLE_DEQP_DATA_DIR=\"gen/vk_gl_cts_data/data\"",
    ]

    if (is_clang) {
@@ -868,12 +870,23 @@ if (build_angle_deqp_tests && !is_fuchsia) {
    angle_deqp_gtest(target_name) {
      forward_variables_from(invoker, "*")

-      defines += [ "ANGLE_DEQP_DATA_DIR=\"data\"" ]
-
      mustpass_name = "${_api}-master.txt"
-      data = [
-        "$deqp_path/data/",
-      ]
+
+      deps = angle_deqp_data_copy_targets
+
+      data = []
+      if (_api == "gles2") {
+        data = angle_deqp_data_gles2
+      } else if (_api == "gles3") {
+        data = angle_deqp_data_gles3
+      } else if (_api == "gles31") {
+        data = angle_deqp_data_gles31
+      } else {
+        # Make sure we include something so that angle_deqp_libtester_main.cpp can find something.
+        data = [
+          "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/misc.test",
+        ]
+      }
    }
  }

@@ -936,38 +949,15 @@ if (build_angle_deqp_tests && !is_fuchsia) {
    include_dirs = [ "$deqp_path/external/vulkancts/framework/vulkan" ]
  }

-  # The KHR dEQP tests expect a root prefix of "gl_cts" for some reason.
-  # This means we need an extra copy step to make them happy.
-  copy("angle_deqp_khr_data") {
-    sources = [
-      "$deqp_path/external/openglcts/data/gles3/arrays.test",
-      "$deqp_path/external/openglcts/data/gles3/declarations.test",
-      "$deqp_path/external/openglcts/data/gles3/literal_parsing.test",
-      "$deqp_path/external/openglcts/data/gles3/name_hiding.test",
-      "$deqp_path/external/openglcts/data/gles3/preprocessor.test",
-      "$deqp_path/external/openglcts/data/gles3/switch.test",
-    ]
-
-    outputs = [
-      "$root_out_dir/$angle_data_dir/gl_cts/data/gles3/{{source_file_part}}",
-    ]
-  }
-
  template("angle_deqp_khr_gtest") {
    angle_deqp_gtest(target_name) {
      forward_variables_from(invoker, "*")
      deps = [
        ":angle_deqp_khr_common",
-        ":angle_deqp_khr_data",
      ]
-
-      defines += [ "ANGLE_DEQP_DATA_DIR=\"$angle_data_dir\"" ]
-
+      deps += angle_deqp_data_copy_targets
+      data = angle_deqp_external_openglcts_data_gles3
      mustpass_dir = _khronos_mustpass
-
-      data_deps = [
-        ":angle_deqp_khr_data",
-      ]
    }
  }


--- a/src/tests/deqp_support/BUILD.gn
+++ b/src/tests/deqp_support/BUILD.gn
+# GENERATED FILE - DO NOT EDIT.
+# Generated by: gen_vk_gl_cts_build.py
+#
+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+deqp_path = "../../../third_party/VK-GL-CTS/src"
+
+copy("vk_gl_cts_data_data_gles2_data") {
+  sources = [
+    "$deqp_path/data/gles2/data/brick.png",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles2/data/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_data_gles2_data_etc1") {
+  sources = [
+    "$deqp_path/data/gles2/data/etc1/photo_helsinki_113x89.pkm",
+    "$deqp_path/data/gles2/data/etc1/photo_helsinki_mip_0.pkm",
+    "$deqp_path/data/gles2/data/etc1/photo_helsinki_mip_1.pkm",
+    "$deqp_path/data/gles2/data/etc1/photo_helsinki_mip_2.pkm",
+    "$deqp_path/data/gles2/data/etc1/photo_helsinki_mip_3.pkm",
+    "$deqp_path/data/gles2/data/etc1/photo_helsinki_mip_4.pkm",
+    "$deqp_path/data/gles2/data/etc1/photo_helsinki_mip_5.pkm",
+    "$deqp_path/data/gles2/data/etc1/photo_helsinki_mip_6.pkm",
+    "$deqp_path/data/gles2/data/etc1/photo_helsinki_mip_7.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_61x61_neg_x.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_61x61_neg_y.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_61x61_neg_z.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_61x61_pos_x.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_61x61_pos_y.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_61x61_pos_z.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_x_mip_0.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_x_mip_1.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_x_mip_2.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_x_mip_3.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_x_mip_4.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_x_mip_5.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_x_mip_6.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_y_mip_0.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_y_mip_1.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_y_mip_2.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_y_mip_3.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_y_mip_4.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_y_mip_5.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_y_mip_6.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_z_mip_0.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_z_mip_1.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_z_mip_2.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_z_mip_3.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_z_mip_4.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_z_mip_5.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_neg_z_mip_6.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_x_mip_0.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_x_mip_1.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_x_mip_2.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_x_mip_3.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_x_mip_4.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_x_mip_5.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_x_mip_6.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_y_mip_0.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_y_mip_1.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_y_mip_2.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_y_mip_3.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_y_mip_4.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_y_mip_5.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_y_mip_6.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_z_mip_0.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_z_mip_1.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_z_mip_2.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_z_mip_3.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_z_mip_4.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_z_mip_5.pkm",
+    "$deqp_path/data/gles2/data/etc1/skybox_pos_z_mip_6.pkm",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_data_gles2_shaders") {
+  sources = [
+    "$deqp_path/data/gles2/shaders/conditionals.test",
+    "$deqp_path/data/gles2/shaders/constant_expressions.test",
+    "$deqp_path/data/gles2/shaders/constants.test",
+    "$deqp_path/data/gles2/shaders/conversions.test",
+    "$deqp_path/data/gles2/shaders/declarations.test",
+    "$deqp_path/data/gles2/shaders/fragdata.test",
+    "$deqp_path/data/gles2/shaders/functions.test",
+    "$deqp_path/data/gles2/shaders/invalid_constant_expressions.test",
+    "$deqp_path/data/gles2/shaders/invalid_implicit_conversions.test",
+    "$deqp_path/data/gles2/shaders/invalid_texture_functions.test",
+    "$deqp_path/data/gles2/shaders/keywords.test",
+    "$deqp_path/data/gles2/shaders/linkage.test",
+    "$deqp_path/data/gles2/shaders/loops.test",
+    "$deqp_path/data/gles2/shaders/misc.test",
+    "$deqp_path/data/gles2/shaders/preprocessor.test",
+    "$deqp_path/data/gles2/shaders/qualification_order.test",
+    "$deqp_path/data/gles2/shaders/reserved_operators.test",
+    "$deqp_path/data/gles2/shaders/scoping.test",
+    "$deqp_path/data/gles2/shaders/swizzles.test",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_data_gles3_data") {
+  sources = [
+    "$deqp_path/data/gles3/data/brick.png",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles3/data/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_data_gles3_data_etc1") {
+  sources = [
+    "$deqp_path/data/gles3/data/etc1/photo_helsinki_113x89.pkm",
+    "$deqp_path/data/gles3/data/etc1/photo_helsinki_mip_0.pkm",
+    "$deqp_path/data/gles3/data/etc1/photo_helsinki_mip_1.pkm",
+    "$deqp_path/data/gles3/data/etc1/photo_helsinki_mip_2.pkm",
+    "$deqp_path/data/gles3/data/etc1/photo_helsinki_mip_3.pkm",
+    "$deqp_path/data/gles3/data/etc1/photo_helsinki_mip_4.pkm",
+    "$deqp_path/data/gles3/data/etc1/photo_helsinki_mip_5.pkm",
+    "$deqp_path/data/gles3/data/etc1/photo_helsinki_mip_6.pkm",
+    "$deqp_path/data/gles3/data/etc1/photo_helsinki_mip_7.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_61x61_neg_x.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_61x61_neg_y.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_61x61_neg_z.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_61x61_pos_x.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_61x61_pos_y.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_61x61_pos_z.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_x_mip_0.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_x_mip_1.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_x_mip_2.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_x_mip_3.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_x_mip_4.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_x_mip_5.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_x_mip_6.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_y_mip_0.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_y_mip_1.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_y_mip_2.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_y_mip_3.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_y_mip_4.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_y_mip_5.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_y_mip_6.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_z_mip_0.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_z_mip_1.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_z_mip_2.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_z_mip_3.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_z_mip_4.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_z_mip_5.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_neg_z_mip_6.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_x_mip_0.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_x_mip_1.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_x_mip_2.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_x_mip_3.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_x_mip_4.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_x_mip_5.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_x_mip_6.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_y_mip_0.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_y_mip_1.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_y_mip_2.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_y_mip_3.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_y_mip_4.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_y_mip_5.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_y_mip_6.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_z_mip_0.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_z_mip_1.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_z_mip_2.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_z_mip_3.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_z_mip_4.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_z_mip_5.pkm",
+    "$deqp_path/data/gles3/data/etc1/skybox_pos_z_mip_6.pkm",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_data_gles3_shaders") {
+  sources = [
+    "$deqp_path/data/gles3/shaders/arrays.test",
+    "$deqp_path/data/gles3/shaders/conditionals.test",
+    "$deqp_path/data/gles3/shaders/constant_expressions.test",
+    "$deqp_path/data/gles3/shaders/constants.test",
+    "$deqp_path/data/gles3/shaders/conversions.test",
+    "$deqp_path/data/gles3/shaders/declarations.test",
+    "$deqp_path/data/gles3/shaders/fragdata.test",
+    "$deqp_path/data/gles3/shaders/functions.test",
+    "$deqp_path/data/gles3/shaders/indexing.test",
+    "$deqp_path/data/gles3/shaders/invalid_implicit_conversions.test",
+    "$deqp_path/data/gles3/shaders/invalid_texture_functions.test",
+    "$deqp_path/data/gles3/shaders/keywords.test",
+    "$deqp_path/data/gles3/shaders/large_constant_arrays.test",
+    "$deqp_path/data/gles3/shaders/linkage.test",
+    "$deqp_path/data/gles3/shaders/loops.test",
+    "$deqp_path/data/gles3/shaders/negative.test",
+    "$deqp_path/data/gles3/shaders/preprocessor.test",
+    "$deqp_path/data/gles3/shaders/qualification_order.test",
+    "$deqp_path/data/gles3/shaders/scoping.test",
+    "$deqp_path/data/gles3/shaders/switch.test",
+    "$deqp_path/data/gles3/shaders/swizzle_math_operations.test",
+    "$deqp_path/data/gles3/shaders/swizzles.test",
+    "$deqp_path/data/gles3/shaders/uniform_block.test",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_data_gles31_data_tessellation") {
+  sources = [
+    "$deqp_path/data/gles31/data/tessellation/barrier_ref.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_quads_equal_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_quads_equal_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_quads_equal_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_triangles_equal_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_triangles_equal_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_triangles_equal_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_quads_equal_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_quads_equal_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_quads_equal_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_triangles_equal_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_triangles_equal_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_triangles_equal_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/gl_position_ref.png",
+    "$deqp_path/data/gles31/data/tessellation/isolines_equal_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/isolines_equal_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/isolines_equal_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/isolines_fractional_even_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/isolines_fractional_even_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/isolines_fractional_even_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/isolines_fractional_odd_spacing_ref_0.png",
+    "$deqp_path/data/gles31/data/tessellation/isolines_fractional_odd_spacing_ref_1.png",
+    "$deqp_path/data/gles31/data/tessellation/isolines_fractional_odd_spacing_ref_2.png",
+    "$deqp_path/data/gles31/data/tessellation/patch_vertices_10_in_10_out_ref.png",
+    "$deqp_path/data/gles31/data/tessellation/patch_vertices_10_in_5_out_ref.png",
+    "$deqp_path/data/gles31/data/tessellation/patch_vertices_5_in_10_out_ref.png",
+    "$deqp_path/data/gles31/data/tessellation/primitive_id_tcs_ref.png",
+    "$deqp_path/data/gles31/data/tessellation/primitive_id_tes_ref.png",
+    "$deqp_path/data/gles31/data/tessellation/user_defined_io_isolines_ref.png",
+    "$deqp_path/data/gles31/data/tessellation/user_defined_io_quads_ref.png",
+    "$deqp_path/data/gles31/data/tessellation/user_defined_io_triangles_ref.png",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_data_gles31_shaders_es31") {
+  sources = [
+    "$deqp_path/data/gles31/shaders/es31/android_extension_pack.test",
+    "$deqp_path/data/gles31/shaders/es31/arrays.test",
+    "$deqp_path/data/gles31/shaders/es31/arrays_of_arrays.test",
+    "$deqp_path/data/gles31/shaders/es31/declarations.test",
+    "$deqp_path/data/gles31/shaders/es31/functions.test",
+    "$deqp_path/data/gles31/shaders/es31/implicit_conversions.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_geometry.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_geometry_uniform_types.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_geometry_varying_types.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_io_block.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_shader_storage_block.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_tessellation.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_tessellation_geometry.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_tessellation_geometry_varying_types.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_tessellation_uniform_types.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_tessellation_varying_types.test",
+    "$deqp_path/data/gles31/shaders/es31/linkage_uniform.test",
+    "$deqp_path/data/gles31/shaders/es31/separate_shader_validation.test",
+    "$deqp_path/data/gles31/shaders/es31/tessellation_negative_user_defined_io.test",
+    "$deqp_path/data/gles31/shaders/es31/uniform_block.test",
+    "$deqp_path/data/gles31/shaders/es31/uniform_location.test",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_data_gles31_shaders_es32") {
+  sources = [
+    "$deqp_path/data/gles31/shaders/es32/android_extension_pack.test",
+    "$deqp_path/data/gles31/shaders/es32/arrays.test",
+    "$deqp_path/data/gles31/shaders/es32/arrays_of_arrays.test",
+    "$deqp_path/data/gles31/shaders/es32/functions.test",
+    "$deqp_path/data/gles31/shaders/es32/implicit_conversions.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_geometry.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_geometry_uniform_types.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_geometry_varying_types.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_io_block.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_shader_storage_block.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_tessellation.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_tessellation_geometry.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_tessellation_geometry_varying_types.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_tessellation_uniform_types.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_tessellation_varying_types.test",
+    "$deqp_path/data/gles31/shaders/es32/linkage_uniform.test",
+    "$deqp_path/data/gles31/shaders/es32/separate_shader_validation.test",
+    "$deqp_path/data/gles31/shaders/es32/tessellation_negative_user_defined_io.test",
+    "$deqp_path/data/gles31/shaders/es32/uniform_block.test",
+    "$deqp_path/data/gles31/shaders/es32/uniform_location.test",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz") {
+  sources = [
+    "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/vertexShader.glsl",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/{{source_file_part}}",
+  ]
+}
+
+copy(
+    "vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_bubblesort_flag") {
+  sources = [
+    "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/bubblesort_flag/recipient.frag",
+    "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/bubblesort_flag/variant_1.frag",
+    "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/bubblesort_flag/variant_2.frag",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/bubblesort_flag/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_synthetic") {
+  sources = [
+    "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/synthetic/recipient.frag",
+    "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/synthetic/variant_1.frag",
+    "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/synthetic/variant_2.frag",
+    "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/synthetic/variant_3.frag",
+    "$deqp_path/external/graphicsfuzz/data/gles3/graphicsfuzz/synthetic/variant_4.frag",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/{{source_file_part}}",
+  ]
+}
+
+copy("vk_gl_cts_data_external_openglcts_data_gles3") {
+  sources = [
+    "$deqp_path/external/openglcts/data/gles3/arrays.test",
+    "$deqp_path/external/openglcts/data/gles3/declarations.test",
+    "$deqp_path/external/openglcts/data/gles3/literal_parsing.test",
+    "$deqp_path/external/openglcts/data/gles3/name_hiding.test",
+    "$deqp_path/external/openglcts/data/gles3/preprocessor.test",
+    "$deqp_path/external/openglcts/data/gles3/switch.test",
+  ]
+  outputs = [
+    "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/{{source_file_part}}",
+  ]
+}
--- a/src/tests/deqp.gni
+++ b/src/tests/deqp.gni
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

-import("../../gni/angle.gni")
+import("../../../gni/angle.gni")
 deqp_path = "../../third_party/VK-GL-CTS/src"

 deqp_include_dirs = [

--- a/src/tests/deqp_support/deqp_data_autogen.gni
+++ b/src/tests/deqp_support/deqp_data_autogen.gni
+# GENERATED FILE - DO NOT EDIT.
+# Generated by: gen_vk_gl_cts_build.py
+#
+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("deqp.gni")
+
+angle_deqp_data_gles2 = [
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/brick.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/photo_helsinki_113x89.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/photo_helsinki_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/photo_helsinki_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/photo_helsinki_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/photo_helsinki_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/photo_helsinki_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/photo_helsinki_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/photo_helsinki_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/photo_helsinki_mip_7.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_61x61_neg_x.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_61x61_neg_y.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_61x61_neg_z.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_61x61_pos_x.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_61x61_pos_y.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_61x61_pos_z.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_x_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_x_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_x_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_x_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_x_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_x_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_x_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_y_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_y_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_y_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_y_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_y_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_y_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_y_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_z_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_z_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_z_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_z_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_z_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_z_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_neg_z_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_x_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_x_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_x_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_x_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_x_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_x_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_x_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_y_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_y_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_y_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_y_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_y_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_y_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_y_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_z_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_z_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_z_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_z_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_z_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_z_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/data/etc1/skybox_pos_z_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/conditionals.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/constant_expressions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/constants.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/conversions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/declarations.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/fragdata.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/functions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/invalid_constant_expressions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/invalid_implicit_conversions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/invalid_texture_functions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/keywords.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/linkage.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/loops.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/misc.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/preprocessor.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/qualification_order.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/reserved_operators.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/scoping.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/swizzles.test",
+]
+
+angle_deqp_data_gles3 = [
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/brick.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/photo_helsinki_113x89.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/photo_helsinki_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/photo_helsinki_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/photo_helsinki_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/photo_helsinki_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/photo_helsinki_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/photo_helsinki_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/photo_helsinki_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/photo_helsinki_mip_7.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_61x61_neg_x.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_61x61_neg_y.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_61x61_neg_z.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_61x61_pos_x.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_61x61_pos_y.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_61x61_pos_z.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_x_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_x_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_x_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_x_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_x_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_x_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_x_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_y_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_y_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_y_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_y_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_y_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_y_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_y_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_z_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_z_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_z_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_z_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_z_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_z_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_neg_z_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_x_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_x_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_x_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_x_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_x_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_x_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_x_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_y_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_y_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_y_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_y_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_y_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_y_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_y_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_z_mip_0.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_z_mip_1.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_z_mip_2.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_z_mip_3.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_z_mip_4.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_z_mip_5.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/data/etc1/skybox_pos_z_mip_6.pkm",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/arrays.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/conditionals.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/constant_expressions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/constants.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/conversions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/declarations.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/fragdata.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/functions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/indexing.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/invalid_implicit_conversions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/invalid_texture_functions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/keywords.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/large_constant_arrays.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/linkage.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/loops.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/negative.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/preprocessor.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/qualification_order.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/scoping.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/switch.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/swizzle_math_operations.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/swizzles.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/shaders/uniform_block.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/bubblesort_flag/recipient.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/bubblesort_flag/variant_1.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/bubblesort_flag/variant_2.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/recipient.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/variant_1.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/variant_2.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/variant_3.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/variant_4.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/vertexShader.glsl",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/arrays.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/declarations.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/literal_parsing.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/name_hiding.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/preprocessor.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/switch.test",
+]
+
+angle_deqp_data_gles31 = [
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/barrier_ref.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_quads_equal_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_quads_equal_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_quads_equal_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_quads_fractional_even_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_quads_fractional_odd_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_triangles_equal_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_triangles_equal_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_triangles_equal_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_triangles_fractional_even_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_cover_triangles_fractional_odd_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_quads_equal_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_quads_equal_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_quads_equal_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_quads_fractional_even_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_quads_fractional_odd_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_triangles_equal_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_triangles_equal_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_triangles_equal_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_triangles_fractional_even_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/fill_overlap_triangles_fractional_odd_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/gl_position_ref.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/isolines_equal_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/isolines_equal_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/isolines_equal_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/isolines_fractional_even_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/isolines_fractional_even_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/isolines_fractional_even_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/isolines_fractional_odd_spacing_ref_0.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/isolines_fractional_odd_spacing_ref_1.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/isolines_fractional_odd_spacing_ref_2.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/patch_vertices_10_in_10_out_ref.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/patch_vertices_10_in_5_out_ref.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/patch_vertices_5_in_10_out_ref.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/primitive_id_tcs_ref.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/primitive_id_tes_ref.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/user_defined_io_isolines_ref.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/user_defined_io_quads_ref.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/data/tessellation/user_defined_io_triangles_ref.png",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/android_extension_pack.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/arrays.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/arrays_of_arrays.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/declarations.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/functions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/implicit_conversions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_geometry.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_geometry_uniform_types.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_geometry_varying_types.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_io_block.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_shader_storage_block.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_tessellation.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_tessellation_geometry.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_tessellation_geometry_varying_types.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_tessellation_uniform_types.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_tessellation_varying_types.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/linkage_uniform.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/separate_shader_validation.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/tessellation_negative_user_defined_io.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/uniform_block.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es31/uniform_location.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/android_extension_pack.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/arrays.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/arrays_of_arrays.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/functions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/implicit_conversions.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_geometry.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_geometry_uniform_types.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_geometry_varying_types.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_io_block.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_shader_storage_block.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_tessellation.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_tessellation_geometry.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_tessellation_geometry_varying_types.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_tessellation_uniform_types.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_tessellation_varying_types.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/linkage_uniform.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/separate_shader_validation.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/tessellation_negative_user_defined_io.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/uniform_block.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gles31/shaders/es32/uniform_location.test",
+]
+
+angle_deqp_external_graphicsfuzz_data_gles3 = [
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/bubblesort_flag/recipient.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/bubblesort_flag/variant_1.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/bubblesort_flag/variant_2.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/recipient.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/variant_1.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/variant_2.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/variant_3.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/variant_4.frag",
+  "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/vertexShader.glsl",
+]
+
+angle_deqp_external_openglcts_data_gles3 = [
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/arrays.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/declarations.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/literal_parsing.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/name_hiding.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/preprocessor.test",
+  "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/switch.test",
+]
+
+angle_deqp_data_copy_targets = [
+  "deqp_support:vk_gl_cts_data_data_gles2_data",
+  "deqp_support:vk_gl_cts_data_data_gles2_data_etc1",
+  "deqp_support:vk_gl_cts_data_data_gles2_shaders",
+  "deqp_support:vk_gl_cts_data_data_gles3_data",
+  "deqp_support:vk_gl_cts_data_data_gles3_data_etc1",
+  "deqp_support:vk_gl_cts_data_data_gles3_shaders",
+  "deqp_support:vk_gl_cts_data_data_gles31_data_tessellation",
+  "deqp_support:vk_gl_cts_data_data_gles31_shaders_es31",
+  "deqp_support:vk_gl_cts_data_data_gles31_shaders_es32",
+  "deqp_support:vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz",
+  "deqp_support:vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_bubblesort_flag",
+  "deqp_support:vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_synthetic",
+  "deqp_support:vk_gl_cts_data_external_openglcts_data_gles3",
+]
--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -106,9 +106,6 @@
 // Flaky on Win7 D3D11 NVIDIA
 4070 WIN7 D3D11 NVIDIA : dEQP-GLES3.functional.rasterization.flatshading.triangles = FAIL

-// Failing everywhere
-2322 : dEQP-GLES3.functional.shaders.metamorphic.* = FAIL
-
 // Vertex attribute aliasing is not supported on D3D
 3467 D3D9 : dEQP-GLES3.functional.attribute_location.bind_aliasing.cond* = FAIL
 3467 D3D9 : dEQP-GLES3.functional.attribute_location.bind_aliasing.max_cond* = FAIL
@@ -520,6 +517,7 @@
 3308 NEXUS5X GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.3 = FAIL
 3308 NEXUS5X GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.8 = FAIL
 3308 NEXUS5X GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.10 = FAIL
+2322 NEXUS5X GLES : dEQP-GLES3.functional.shaders.metamorphic.* = SKIP

 // Seems to fail on all desktop GL
 2960 OPENGL : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8 = FAIL