deps: Roll VK-GL-CTS

DEPS

@@ -22,10 +22,10 @@ vars = {
   'chromium_revision': 'b0410bba028cf153be2d02e36b6e99b59fdcb000',
 
   # Current revision of VK-GL-CTS (a.k.a dEQP).
-  'vk_gl_cts_revision': 'a6b249819f7177821d4b7eefff36af07fef71825',
+  'vk_gl_cts_revision': '60972ed7fa8fb66b64e21186e7fb13dc082bdac8',
 
   # Current revision of glslang, the Khronos SPIRV compiler.
-  'glslang_revision': '2c53baedbb64049e15ed8d3b38f867c1d9bec097',
+  'glslang_revision': 'b5f003d7a3ece37db45578a8a3140b370036fc64',
 
   # Current revision of googletest.
   # Note: this dep cannot be auto-rolled b/c of nesting.

scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json

@@ -6,11 +6,11 @@
   "src/tests/deqp_support/deqp_data_autogen.gni":
     "3a74e9e404a9b1a4ff1a78d8a640c472",
   "third_party/VK-GL-CTS/src/CMakeLists.txt":
-    "98f0575b3871b208ce30150dea2081d6",
+    "b3a451350b7e54837e3208b02d86e9c5",
   "third_party/VK-GL-CTS/src/execserver/CMakeLists.txt":
     "38aa187592e6ef9a331fc1ea313fc68d",
   "third_party/VK-GL-CTS/src/executor/CMakeLists.txt":
-    "c160665aff880be214feba6813ed1687",
+    "3c256f00625f67d2a8d9ead5f21faddf",
   "third_party/VK-GL-CTS/src/external/amber/CMakeLists.txt":
     "f83a418b79863e90de781d8be6515246",
   "third_party/VK-GL-CTS/src/external/glslang/CMakeLists.txt":
@@ -22,7 +22,7 @@
   "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",
+    "6fac0f4254e7792284fb086547210811",
   "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":
@@ -38,17 +38,17 @@
   "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",
+    "4c00859a4a700bec7793221dbbf42e2a",
   "third_party/VK-GL-CTS/src/external/spirv-tools/CMakeLists.txt":
     "cca8b4b984c40afb9880d177d53623a1",
   "third_party/VK-GL-CTS/src/external/vulkancts/framework/vulkan/CMakeLists.txt":
-    "260b2a1ffb1369e997cde61956d973ba",
+    "7f90f08bea39abbd86db1503b716a536",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/CMakeLists.txt":
     "58a0f556db356700cfbf93396fc9be74",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/amber/CMakeLists.txt":
-    "86cb03a771d5c0a57a6e0dbb305c2aba",
+    "6728615fdef5984e305934f10efc6892",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/api/CMakeLists.txt":
-    "2da9d05ef3ba768632d7362d1ffaa143",
+    "28aeb151111f9fcaa0ea50ab5899e1b7",
   "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":
@@ -62,7 +62,7 @@
   "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",
+    "bafb72d398e80d60a9b5257e1922619f",
   "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":
@@ -72,7 +72,7 @@
   "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":
-    "0037388ae1cb072440e325e59c141418",
+    "31fbbd3cd0f49d19135363307558a66a",
   "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":
@@ -86,7 +86,7 @@
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/protected_memory/CMakeLists.txt":
     "62389a457fa79ff09317b745e0c2f4aa",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/query_pool/CMakeLists.txt":
-    "a6087d1fdde5a0f762090b09bce60a26",
+    "8eb77c8b1ebe7d533eee1404022da713",
   "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":
@@ -100,17 +100,17 @@
   "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":
-    "c8a3609e6a3b3813bcd5bef6d576cdec",
+    "4c8be094d14fc14497edbc8b467cc903",
   "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",
+    "d5502ba8e189212eef2e6ec1426f17a6",
   "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",
+    "e1a6c593990fbf68ada75efba89410fb",
   "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":
@@ -120,13 +120,13 @@
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/wsi/CMakeLists.txt":
     "32a8d4283697d53b99135ab7cda06957",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ycbcr/CMakeLists.txt":
-    "1c52b684259622de369aadbb5686a0e4",
+    "44dbe345080578d6b4a227a392ccf69e",
   "third_party/VK-GL-CTS/src/external/zlib/CMakeLists.txt":
     "dae46a72968caa2df17a8d989dc43ec0",
   "third_party/VK-GL-CTS/src/framework/CMakeLists.txt":
-    "b73b4bccc2a3d52c0db65d2d0e010828",
+    "edeee2284578f1b76122adee5e42f0e7",
   "third_party/VK-GL-CTS/src/framework/common/CMakeLists.txt":
-    "dc08a30095d0054cc67dd0fdab218e5e",
+    "02814cd8baaecdf783cb431f13844fe4",
   "third_party/VK-GL-CTS/src/framework/delibs/debase/CMakeLists.txt":
     "136b8d2068c0920684582500843b3f88",
   "third_party/VK-GL-CTS/src/framework/delibs/decpp/CMakeLists.txt":
@@ -154,11 +154,13 @@
   "third_party/VK-GL-CTS/src/framework/platform/CMakeLists.txt":
     "61165590822c668da40db99db8f2b45b",
   "third_party/VK-GL-CTS/src/framework/qphelper/CMakeLists.txt":
-    "bff80adc305e9e5c527b1ad6db53e99f",
+    "cfe4e498db0086eea5c5735d16a8f1ec",
   "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/framework/xexml/CMakeLists.txt":
+    "58c91860abe3f6515acbf5a5abce6f0c",
   "third_party/VK-GL-CTS/src/modules/CMakeLists.txt":
     "632cf1d4d696b1e19c01c6d11e2d59c4",
   "third_party/VK-GL-CTS/src/modules/egl/CMakeLists.txt":

src/tests/BUILD.gn

@@ -992,6 +992,27 @@ if (build_angle_deqp_tests && !is_fuchsia) {
     sources = deqp_framework_decpp_sources
   }
 
+  config("angle_deqp_framework_xexml_config") {
+    include_dirs = [ "$deqp_path/framework/xexml" ]
+  }
+
+  angle_deqp_source_set("angle_deqp_framework_xexml") {
+    public_configs += [
+      ":angle_deqp_support",
+      ":angle_deqp_framework_decpp_config",
+      ":angle_deqp_framework_delibs_config",
+      "//build/config/compiler:exceptions",
+      "//build/config/compiler:no_chromium_code",
+    ]
+
+    public_deps = [
+      ":angle_deqp_framework_debase",
+      ":angle_deqp_framework_decpp",
+      ":angle_deqp_framework_delibs",
+    ]
+    sources = deqp_framework_xexml_sources
+  }
+
   config("angle_deqp_libtester_config") {
     defines = [ "ANGLE_DEQP_LIBTESTER_IMPLEMENTATION" ]
 
@@ -1050,6 +1071,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
     public_deps = [
       ":angle_deqp_framework_decpp",
       ":angle_deqp_framework_qphelper",
+      ":angle_deqp_framework_xexml",
     ]
   }
 

src/tests/deqp_support/deqp.gni

@@ -9,6 +9,7 @@ deqp_include_dirs = [
   "$deqp_path/executor",
   "$deqp_path/execserver",
   "$deqp_path/framework/platform/null",
+  "$deqp_path/framework/xexml",
   "$deqp_path/modules/gles2",
   "$deqp_path/modules/gles2/functional",
   "$deqp_path/modules/gles2/accuracy",
@@ -891,6 +892,8 @@ deqp_khr_common_sources = [
   "$deqp_path/external/openglcts/modules/common/glcMisc.hpp",
   "$deqp_path/external/openglcts/modules/common/glcMultipleContextsTests.cpp",
   "$deqp_path/external/openglcts/modules/common/glcMultipleContextsTests.hpp",
+  "$deqp_path/external/openglcts/modules/common/glcNearestEdgeTests.cpp",
+  "$deqp_path/external/openglcts/modules/common/glcNearestEdgeTests.hpp",
   "$deqp_path/external/openglcts/modules/common/glcNoDefaultContextPackage.cpp",
   "$deqp_path/external/openglcts/modules/common/glcNoDefaultContextPackage.hpp",
   "$deqp_path/external/openglcts/modules/common/glcNoErrorTests.cpp",
@@ -1506,6 +1509,13 @@ deqp_framework_decpp_sources = [
   "$deqp_path/framework/delibs/decpp/deUniquePtr.hpp",
 ]
 
+deqp_framework_xexml_sources = [
+  "$deqp_path/framework/xexml/xeDefs.cpp",
+  "$deqp_path/framework/xexml/xeDefs.hpp",
+  "$deqp_path/framework/xexml/xeXMLParser.cpp",
+  "$deqp_path/framework/xexml/xeXMLParser.hpp",
+]
+
 deqp_framework_opengl_sources = [
   "$deqp_path/framework/opengl/gluCallLogUtil.inl",
   "$deqp_path/framework/opengl/gluCallLogWrapper.cpp",
@@ -1783,6 +1793,8 @@ deqp_framework_common_sources = [
   "$deqp_path/framework/common/tcuVector.hpp",
   "$deqp_path/framework/common/tcuVectorType.hpp",
   "$deqp_path/framework/common/tcuVectorUtil.hpp",
+  "$deqp_path/framework/common/tcuWaiverUtil.cpp",
+  "$deqp_path/framework/common/tcuWaiverUtil.hpp",
   "$deqp_path/framework/randomshaders/rsgBinaryOps.cpp",
   "$deqp_path/framework/randomshaders/rsgBinaryOps.hpp",
   "$deqp_path/framework/randomshaders/rsgBuiltinFunctions.cpp",
@@ -1968,8 +1980,6 @@ deqp_libtester_sources = [
   "$deqp_path/executor/xeCommLink.hpp",
   "$deqp_path/executor/xeContainerFormatParser.cpp",
   "$deqp_path/executor/xeContainerFormatParser.hpp",
-  "$deqp_path/executor/xeDefs.cpp",
-  "$deqp_path/executor/xeDefs.hpp",
   "$deqp_path/executor/xeLocalTcpIpLink.cpp",
   "$deqp_path/executor/xeLocalTcpIpLink.hpp",
   "$deqp_path/executor/xeTcpIpLink.cpp",
@@ -1986,8 +1996,6 @@ deqp_libtester_sources = [
   "$deqp_path/executor/xeTestLogWriter.hpp",
   "$deqp_path/executor/xeTestResultParser.cpp",
   "$deqp_path/executor/xeTestResultParser.hpp",
-  "$deqp_path/executor/xeXMLParser.cpp",
-  "$deqp_path/executor/xeXMLParser.hpp",
   "$deqp_path/executor/xeXMLWriter.cpp",
   "$deqp_path/executor/xeXMLWriter.hpp",
   "$deqp_path/framework/platform/null/tcuNullContextFactory.cpp",

src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt

@@ -127,3 +127,6 @@
 
 // Crashing on Android with SwiftShader
 4240 SWIFTSHADER ANDROID : KHR-GLES31.core.texture_storage_multisample.FunctionalTests.blitting_multisampled_depth_attachment = SKIP
+
+// New failures with latest dEQP roll (2020-04-28)
+4593 SWIFTSHADER : KHR-GLES31.core.nearest_edge.offset_left = FAIL

src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt

@@ -179,3 +179,6 @@
 4019 SWIFTSHADER : KHR-GLES3.shaders.indexing.matrix_subscript.mat4_static_write_dynamic_read_vertex = FAIL
 4019 SWIFTSHADER : KHR-GLES3.shaders.indexing.matrix_subscript.mat4_static_write_static_loop_read_fragment = FAIL
 4019 SWIFTSHADER : KHR-GLES3.shaders.indexing.matrix_subscript.mat4_static_write_static_loop_read_vertex = FAIL
+
+// New failures with latest dEQP roll (2020-04-28)
+4593 SWIFTSHADER : KHR-GLES3.core.nearest_edge.offset_left = FAIL