Roll ANGLE from 97cb3eb8a79d to e92b8e8d97d8 (3 revisions)

https://chromium.googlesource.com/angle/angle.git/+log/97cb3eb8a79d..e92b8e8d97d8

Please enable autosubmit on changes if possible when approving them.

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/angle-android-autoroll
Please CC angle-team@google.com,rmistry@google.com,syoussefi@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Change-Id: Ic638acc7014a78bc126e03815d5ed7a6ceb418fe

10 files changed, 194 insertions, 193 deletions

diff --git a/DEPS b/DEPS
index 4feb48ccad..2d0097093d 100644
--- a/DEPS
+++ b/DEPS
@@ -49,7 +49,7 @@ vars = {
   'dummy_checkout_chromium': False,
 
   # Current revision of VK-GL-CTS (a.k.a dEQP).
-  'vk_gl_cts_revision': 'caf989d22e07aab117427b61276b7fe5ff29ca94',
+  'vk_gl_cts_revision': 'b529676d05230c7f1c8eb5572d787352da2cbace',
 
   # Current revision of googletest.
   # Note: this dep cannot be auto-rolled b/c of nesting.
diff --git a/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json b/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
index 9541391ea8..7201f0b927 100644
--- a/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
+++ b/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
@@ -1,10 +1,10 @@
 {
   "scripts/gen_vk_gl_cts_build.py":
-    "24739596e62c08ed31dbd22a5b8e77be",
+    "b61ec3c6d6610b98bb4b050fae91e35c",
   "src/tests/deqp_support/BUILD.gn":
-    "235621d23c9fc11885f6a29541679898",
+    "b9560bb0069951b2d4a5ac453c6b9065",
   "src/tests/deqp_support/deqp_data_autogen.gni":
-    "66f7f626b3f33cd2aaaceb0592680be9",
+    "ee4959858b1d06191d66e1dcdcb8a1cb",
   "third_party/VK-GL-CTS/src/CMakeLists.txt":
     "edb6df6a790907da91c2e45d3202d2f3",
   "third_party/VK-GL-CTS/src/execserver/CMakeLists.txt":
@@ -24,13 +24,13 @@
   "third_party/VK-GL-CTS/src/external/openglcts/CMakeLists.txt":
     "fefc76d843831c4778fb4f8877f63f04",
   "third_party/VK-GL-CTS/src/external/openglcts/modules/CMakeLists.txt":
-    "b86720876690a503071da70f47dc53f7",
+    "51bab42277ace2f99407b1b88715a92f",
   "third_party/VK-GL-CTS/src/external/openglcts/modules/common/CMakeLists.txt":
     "7662b4a17b08f07b4b2e2a57edceb209",
   "third_party/VK-GL-CTS/src/external/openglcts/modules/common/subgroups/CMakeLists.txt":
     "bf71ce2d9756ccee7833a789737e6481",
   "third_party/VK-GL-CTS/src/external/openglcts/modules/gl/CMakeLists.txt":
-    "88b5e23e6358ef6be23024050521fb01",
+    "0f90224dc01d52e436014cf5f0b14490",
   "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":
@@ -46,7 +46,7 @@
   "third_party/VK-GL-CTS/src/external/spirv-tools/CMakeLists.txt":
     "cca8b4b984c40afb9880d177d53623a1",
   "third_party/VK-GL-CTS/src/external/vulkan-validationlayers/CMakeLists.txt":
-    "6d3afda20373646f619ee0286b486ff2",
+    "630895789ee04e3df8b8f1dce455eb34",
   "third_party/VK-GL-CTS/src/external/vulkancts/framework/vulkan/CMakeLists.txt":
     "ba2c93e2613712520e6f7487eebb302f",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/CMakeLists.txt":
diff --git a/scripts/gen_vk_gl_cts_build.py b/scripts/gen_vk_gl_cts_build.py
index e6d63b1e58..ccd4c1c925 100644
--- a/scripts/gen_vk_gl_cts_build.py
+++ b/scripts/gen_vk_gl_cts_build.py
@@ -19,9 +19,12 @@ def initDataDirectories(dataDirectories):
     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"))
-    dataDirectories.append(os.path.join("external", "openglcts", "data", "gles31"))
-    dataDirectories.append(os.path.join("external", "openglcts", "data", "gles32"))
+    dataDirectories.append(
+        os.path.join("external", "openglcts", "data", "gl_cts", "data", "gles3"))
+    dataDirectories.append(
+        os.path.join("external", "openglcts", "data", "gl_cts", "data", "gles31"))
+    dataDirectories.append(
+        os.path.join("external", "openglcts", "data", "gl_cts", "data", "gles32"))
 
 
 def initPathReplacements(pathReplacements):
@@ -30,7 +33,7 @@ def initPathReplacements(pathReplacements):
     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", "")
+    pathReplacements[pathToReplace] = ""
 
 
 def createBuildGnFile(buildGnPath):
diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn
index 04a13c6a7f..0e54496905 100644
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -1506,16 +1506,12 @@ if (build_angle_deqp_tests && !is_fuchsia) {
   }
 
   _android_mustpass = "$deqp_path/android/cts/main"
-  _aosp_egl_mustpass =
-      "$deqp_path/external/openglcts/data/mustpass/egl/aosp_mustpass/main"
-  _aosp_gles_mustpass =
-      "$deqp_path/external/openglcts/data/mustpass/gles/aosp_mustpass/main"
-  _khronos_gl_mustpass =
-      "$deqp_path/external/openglcts/data/mustpass/gl/khronos_mustpass/main"
-  _khronos_gles_mustpass =
-      "$deqp_path/external/openglcts/data/mustpass/gles/khronos_mustpass/main"
-  _khronos_gles_noctx_mustpass = "$deqp_path/external/openglcts/data/mustpass/gles/khronos_mustpass_noctx/main"
-  _khronos_gles_single_mustpass = "$deqp_path/external/openglcts/data/mustpass/gles/khronos_mustpass_single/main"
+  _aosp_egl_mustpass = "$deqp_path/external/openglcts/data/gl_cts/data/mustpass/egl/aosp_mustpass/main"
+  _aosp_gles_mustpass = "$deqp_path/external/openglcts/data/gl_cts/data/mustpass/gles/aosp_mustpass/main"
+  _khronos_gl_mustpass = "$deqp_path/external/openglcts/data/gl_cts/data/mustpass/gl/khronos_mustpass/main"
+  _khronos_gles_mustpass = "$deqp_path/external/openglcts/data/gl_cts/data/mustpass/gles/khronos_mustpass/main"
+  _khronos_gles_noctx_mustpass = "$deqp_path/external/openglcts/data/gl_cts/data/mustpass/gles/khronos_mustpass_noctx/main"
+  _khronos_gles_single_mustpass = "$deqp_path/external/openglcts/data/gl_cts/data/mustpass/gles/khronos_mustpass_single/main"
 
   angle_deqp_source_set("angle_deqp_gles2_common") {
     sources = deqp_gles2_sources
@@ -1674,13 +1670,13 @@ if (build_angle_deqp_tests && !is_fuchsia) {
         data = [ "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/misc.test" ]
         mustpass_dir = _khronos_gles_mustpass
       } else if (api == "gles3") {
-        data = angle_deqp_external_openglcts_data_gles3
+        data = angle_deqp_external_openglcts_data_gl_cts_data_gles3
         mustpass_dir = _khronos_gles_mustpass
       } else if (api == "gles31") {
-        data = angle_deqp_external_openglcts_data_gles31
+        data = angle_deqp_external_openglcts_data_gl_cts_data_gles31
         mustpass_dir = _khronos_gles_mustpass
       } else if (api == "gles32") {
-        data = angle_deqp_external_openglcts_data_gles32
+        data = angle_deqp_external_openglcts_data_gl_cts_data_gles32
         mustpass_dir = _khronos_gles_mustpass
       } else if (api == "gl46") {
         # Use this as a placeholder, the gl46 test suite does not need data
@@ -1732,7 +1728,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
         data = [ "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/misc.test" ]
         mustpass_dir = _khronos_gles_noctx_mustpass
       } else if (api == "gles32") {
-        data = angle_deqp_external_openglcts_data_gles32
+        data = angle_deqp_external_openglcts_data_gl_cts_data_gles32
         mustpass_dir = _khronos_gles_noctx_mustpass
       } else {
         assert(false)
@@ -1758,7 +1754,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
       deps = [ ":angle_deqp_khr_common" ]
       deps += angle_deqp_data_copy_targets
       if (api == "gles32") {
-        data = angle_deqp_external_openglcts_data_gles32
+        data = angle_deqp_external_openglcts_data_gl_cts_data_gles32
         mustpass_dir = _khronos_gles_single_mustpass
       } else {
         assert(false)
diff --git a/src/tests/deqp_support/BUILD.gn b/src/tests/deqp_support/BUILD.gn
index 0eef0fe511..895b748771 100644
--- a/src/tests/deqp_support/BUILD.gn
+++ b/src/tests/deqp_support/BUILD.gn
@@ -366,171 +366,173 @@ copy("vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_synthetic") {
   outputs = [ "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/synthetic/{{source_file_part}}" ]
 }
 
-copy("vk_gl_cts_data_external_openglcts_data_gles3") {
+copy("vk_gl_cts_data_external_openglcts_data_gl_cts_data_gles3") {
   sources = [
-    "$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",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles3/declarations.test",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles3/literal_parsing.test",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles3/name_hiding.test",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles3/preprocessor.test",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles3/switch.test",
   ]
   outputs = [
     "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/{{source_file_part}}",
   ]
 }
 
-copy("vk_gl_cts_data_external_openglcts_data_gles31_compressed_texture") {
+copy(
+    "vk_gl_cts_data_external_openglcts_data_gl_cts_data_gles31_compressed_texture") {
   sources = [
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RGB8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RGB8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RGB8_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RGBA1_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RGBA1_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RGBA1_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RGBA8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RGBA8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RGBA8_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RG_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RG_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RG_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RG_signed_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RG_signed_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_RG_signed_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_R_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_R_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_R_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_R_signed_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_R_signed_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_R_signed_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_sRGB8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_sRGB8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_sRGB8_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_sRGBA1_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_sRGBA1_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_sRGBA1_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_sRGBA8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_sRGBA8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles31/compressed_texture/etc_sRGBA8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RGB8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RGB8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RGB8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RGBA1_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RGBA1_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RGBA1_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RGBA8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RGBA8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RGBA8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RG_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RG_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RG_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RG_signed_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RG_signed_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_RG_signed_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_R_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_R_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_R_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_R_signed_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_R_signed_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_R_signed_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_sRGB8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_sRGB8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_sRGB8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_sRGBA1_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_sRGBA1_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_sRGBA1_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_sRGBA8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_sRGBA8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles31/compressed_texture/etc_sRGBA8_240x240_ref.bin",
   ]
   outputs = [ "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles31/compressed_texture/{{source_file_part}}" ]
 }
 
-copy("vk_gl_cts_data_external_openglcts_data_gles32_compressed_texture") {
+copy(
+    "vk_gl_cts_data_external_openglcts_data_gl_cts_data_gles32_compressed_texture") {
   sources = [
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x10_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x10_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x10_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x5_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x5_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x5_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x6_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x6_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x6_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_10x8_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_12x10_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_12x10_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_12x10_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_12x12_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_12x12_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_12x12_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_4x4_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_4x4_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_4x4_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_5x4_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_5x4_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_5x4_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_5x5_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_5x5_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_5x5_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_6x5_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_6x5_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_6x5_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_6x6_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_6x6_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_6x6_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_8x5_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_8x5_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_8x5_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_8x6_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_8x6_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_8x6_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_8x8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_8x8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_RGBA_8x8_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x10_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x10_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x10_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x5_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x5_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x5_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x6_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x6_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x6_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_10x8_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_12x10_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_12x10_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_12x10_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_12x12_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_12x12_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_12x12_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_4x4_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_4x4_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_4x4_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_5x4_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_5x4_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_5x4_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_5x5_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_5x5_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_5x5_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_6x5_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_6x5_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_6x5_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_6x6_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_6x6_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_6x6_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_8x5_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_8x5_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_8x5_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_8x6_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_8x6_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_8x6_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_8x8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_8x8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/astc_SRGBA_8x8_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RGB8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RGB8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RGB8_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RGBA1_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RGBA1_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RGBA1_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RGBA8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RGBA8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RGBA8_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RG_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RG_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RG_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RG_signed_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RG_signed_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_RG_signed_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_R_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_R_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_R_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_R_signed_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_R_signed_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_R_signed_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_sRGB8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_sRGB8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_sRGB8_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_sRGBA1_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_sRGBA1_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_sRGBA1_240x240_ref.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_sRGBA8_120x120.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_sRGBA8_240x240.bin",
-    "$deqp_path/external/openglcts/data/gles32/compressed_texture/etc_sRGBA8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x10_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x10_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x10_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x5_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x5_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x5_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x6_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x6_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x6_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_12x10_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_12x10_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_12x10_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_12x12_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_12x12_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_12x12_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_4x4_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_4x4_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_4x4_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_5x4_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_5x4_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_5x4_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_5x5_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_5x5_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_5x5_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_6x5_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_6x5_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_6x5_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_6x6_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_6x6_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_6x6_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_8x5_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_8x5_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_8x5_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_8x6_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_8x6_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_8x6_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_8x8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_8x8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_8x8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x10_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x10_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x10_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x5_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x5_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x5_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x6_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x6_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x6_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_10x8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_12x10_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_12x10_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_12x10_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_12x12_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_12x12_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_12x12_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_4x4_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_4x4_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_4x4_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_5x4_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_5x4_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_5x4_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_5x5_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_5x5_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_5x5_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_6x5_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_6x5_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_6x5_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_6x6_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_6x6_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_6x6_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_8x5_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_8x5_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_8x5_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_8x6_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_8x6_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_8x6_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_8x8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_8x8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/astc_SRGBA_8x8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RGB8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RGB8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RGB8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RGBA1_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RGBA1_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RGBA1_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RGBA8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RGBA8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RGBA8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RG_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RG_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RG_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RG_signed_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RG_signed_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_RG_signed_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_R_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_R_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_R_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_R_signed_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_R_signed_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_R_signed_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_sRGB8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_sRGB8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_sRGB8_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_sRGBA1_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_sRGBA1_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_sRGBA1_240x240_ref.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_sRGBA8_120x120.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_sRGBA8_240x240.bin",
+    "$deqp_path/external/openglcts/data/gl_cts/data/gles32/compressed_texture/etc_sRGBA8_240x240_ref.bin",
   ]
   outputs = [ "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles32/compressed_texture/{{source_file_part}}" ]
 }
diff --git a/src/tests/deqp_support/angle_deqp_gtest.cpp b/src/tests/deqp_support/angle_deqp_gtest.cpp
index 2a1509af58..b9105d4914 100644
--- a/src/tests/deqp_support/angle_deqp_gtest.cpp
+++ b/src/tests/deqp_support/angle_deqp_gtest.cpp
@@ -59,9 +59,9 @@ void HandlePlatformError(PlatformMethods *platform, const char *errorMessage)
 constexpr char kCTSRootPath[] = "third_party/VK-GL-CTS/src/";
 constexpr char kSupportPath[] = "src/tests/deqp_support/";
 
-#define GLES_CTS_DIR(PATH) "external/openglcts/data/mustpass/gles/" PATH
-#define GL_CTS_DIR(PATH) "external/openglcts/data/mustpass/gl/" PATH
-#define EGL_CTS_DIR(PATH) "external/openglcts/data/mustpass/egl/" PATH
+#define GLES_CTS_DIR(PATH) "external/openglcts/data/gl_cts/data/mustpass/gles/" PATH
+#define GL_CTS_DIR(PATH) "external/openglcts/data/gl_cts/data/mustpass/gl/" PATH
+#define EGL_CTS_DIR(PATH) "external/openglcts/data/gl_cts/data/mustpass/egl/" PATH
 
 const char *gCaseListFiles[] = {
     EGL_CTS_DIR("aosp_mustpass/main/egl-main.txt"),
diff --git a/src/tests/deqp_support/deqp.gni b/src/tests/deqp_support/deqp.gni
index a41350e302..65de2dffd4 100644
--- a/src/tests/deqp_support/deqp.gni
+++ b/src/tests/deqp_support/deqp.gni
@@ -1071,6 +1071,8 @@ deqp_khr_gl_sources = [
   "$deqp_path/external/openglcts/modules/gl/gl3cTextureSizePromotion.hpp",
   "$deqp_path/external/openglcts/modules/gl/gl3cTextureSwizzleTests.cpp",
   "$deqp_path/external/openglcts/modules/gl/gl3cTextureSwizzleTests.hpp",
+  "$deqp_path/external/openglcts/modules/gl/gl3cTransformFeedback3Tests.cpp",
+  "$deqp_path/external/openglcts/modules/gl/gl3cTransformFeedback3Tests.hpp",
   "$deqp_path/external/openglcts/modules/gl/gl3cTransformFeedbackOverflowQueryTests.cpp",
   "$deqp_path/external/openglcts/modules/gl/gl3cTransformFeedbackOverflowQueryTests.hpp",
   "$deqp_path/external/openglcts/modules/gl/gl3cTransformFeedbackTests.cpp",
diff --git a/src/tests/deqp_support/deqp_data_autogen.gni b/src/tests/deqp_support/deqp_data_autogen.gni
index bf4f21d49d..a87f9d70d9 100644
--- a/src/tests/deqp_support/deqp_data_autogen.gni
+++ b/src/tests/deqp_support/deqp_data_autogen.gni
@@ -339,7 +339,7 @@ angle_deqp_external_graphicsfuzz_data_gles3 = [
   "$root_gen_dir/vk_gl_cts_data/data/gles3/graphicsfuzz/vertexShader.glsl",
 ]
 
-angle_deqp_external_openglcts_data_gles3 = [
+angle_deqp_external_openglcts_data_gl_cts_data_gles3 = [
   "$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",
@@ -347,7 +347,7 @@ angle_deqp_external_openglcts_data_gles3 = [
   "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles3/switch.test",
 ]
 
-angle_deqp_external_openglcts_data_gles31 = [
+angle_deqp_external_openglcts_data_gl_cts_data_gles31 = [
   "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles31/compressed_texture/etc_RGB8_120x120.bin",
   "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles31/compressed_texture/etc_RGB8_240x240.bin",
   "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles31/compressed_texture/etc_RGB8_240x240_ref.bin",
@@ -380,7 +380,7 @@ angle_deqp_external_openglcts_data_gles31 = [
   "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles31/compressed_texture/etc_sRGBA8_240x240_ref.bin",
 ]
 
-angle_deqp_external_openglcts_data_gles32 = [
+angle_deqp_external_openglcts_data_gl_cts_data_gles32 = [
   "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x10_120x120.bin",
   "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x10_240x240.bin",
   "$root_gen_dir/vk_gl_cts_data/data/gl_cts/data/gles32/compressed_texture/astc_RGBA_10x10_240x240_ref.bin",
@@ -511,7 +511,7 @@ angle_deqp_data_copy_targets = [
   "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",
-  "deqp_support:vk_gl_cts_data_external_openglcts_data_gles31_compressed_texture",
-  "deqp_support:vk_gl_cts_data_external_openglcts_data_gles32_compressed_texture",
+  "deqp_support:vk_gl_cts_data_external_openglcts_data_gl_cts_data_gles3",
+  "deqp_support:vk_gl_cts_data_external_openglcts_data_gl_cts_data_gles31_compressed_texture",
+  "deqp_support:vk_gl_cts_data_external_openglcts_data_gl_cts_data_gles32_compressed_texture",
 ]
diff --git a/src/tests/deqp_support/deqp_gl46_test_expectations.txt b/src/tests/deqp_support/deqp_gl46_test_expectations.txt
index 995a023441..3deca78873 100644
--- a/src/tests/deqp_support/deqp_gl46_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gl46_test_expectations.txt
@@ -75,11 +75,9 @@
 7566 SWIFTSHADER : KHR-GL46.transform_feedback.* = SKIP
 7566 SWIFTSHADER : KHR-GL46.vertex_attrib_binding.* = SKIP
 7566 SWIFTSHADER : KHR-GL46.viewport_array.* = SKIP
+7566 SWIFTSHADER : KHR-GL46.framebuffer_blit.framebuffer_blit_functionality_multisampled_to_singlesampled_blit = FAIL
+7566 SWIFTSHADER : KHR-GL46.texture_lod_bias.texture_lod_bias_all = FAIL
+7566 SWIFTSHADER : KHR-GL46.transform_feedback3.* = SKIP
 
 7566 SWIFTSHADER UBSAN : KHR-GL46.shader_bitfield_operation.bitfieldInsert.int_3 = SKIP
 
-// The newly added cases are failing
-8636 LINUX : KHR-GL46.framebuffer_blit.framebuffer_blit_functionality_multisampled_to_singlesampled_blit = FAIL
-8636 WIN : KHR-GL46.framebuffer_blit.framebuffer_blit_functionality_multisampled_to_singlesampled_blit = FAIL
-b/332383430 LINUX : KHR-GL46.texture_lod_bias.texture_lod_bias_all = FAIL
-b/332383430 WIN : KHR-GL46.texture_lod_bias.texture_lod_bias_all = FAIL
diff --git a/src/tests/py_utils/android_helper.py b/src/tests/py_utils/android_helper.py
index 0d408a4ecc..6b992eb6fa 100644
--- a/src/tests/py_utils/android_helper.py
+++ b/src/tests/py_utils/android_helper.py
@@ -192,7 +192,7 @@ def _AddRestrictedTracesJson():
 
 def _AddDeqpFiles(suite_name):
     patterns = [
-        '../../third_party/VK-GL-CTS/src/external/openglcts/data/mustpass/*/*/main/*.txt',
+        '../../third_party/VK-GL-CTS/src/external/openglcts/data/gl_cts/data/mustpass/*/*/main/*.txt',
         '../../src/tests/deqp_support/*.txt'
     ]
     if '_gles2_' in suite_name: