aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-autoroll <android-autoroll@skia-public.iam.gserviceaccount.com>2024-05-21 00:27:34 +0000
committerandroid-autoroll <android-autoroll@skia-public.iam.gserviceaccount.com>2024-05-21 00:27:34 +0000
commitcbb6550e1d4a695f3ff6c1643cf0c018b3d5def4 (patch)
tree137c06809fed96ec91a2a1cd6f8d230e92926b49
parentf9333db2f34c9502e5bd70a880b88584a2bc7796 (diff)
parent6f8b736e8a3a19387aa65211866fbeeb367432a0 (diff)
downloadangle-main.tar.gz
Roll ANGLE from 9ce8d3ba042d to 6f8b736e8a3a (1 revision)HEADmastermain
https://chromium.googlesource.com/angle/angle.git/+log/9ce8d3ba042d..6f8b736e8a3a 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,yuxinhu@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: I0d1bdeb99de5e7c8238c8c76ed813bbee8be0ae9
-rw-r--r--DEPS2
-rw-r--r--scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json6
-rw-r--r--src/tests/deqp_support/deqp.gni8
-rw-r--r--src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt10
4 files changed, 18 insertions, 8 deletions
diff --git a/DEPS b/DEPS
index 07c77edb54..608fa806e2 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': '13344922ae81cd0033e869dabcb92d2f8bf006f8',
+ 'vk_gl_cts_revision': 'fd5cc7b1e07578e8e807696034ab894b134f4280',
# 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 a13dc8e356..c7b88bb0e7 100644
--- a/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
+++ b/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
@@ -26,11 +26,11 @@
"third_party/VK-GL-CTS/src/external/openglcts/modules/CMakeLists.txt":
"51bab42277ace2f99407b1b88715a92f",
"third_party/VK-GL-CTS/src/external/openglcts/modules/common/CMakeLists.txt":
- "f7260119a30f01a96e71728be5123d09",
+ "38908cad976953ed99c59b6b1ba61a87",
"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":
- "0f90224dc01d52e436014cf5f0b14490",
+ "143dffb11c57e173f8f73966466c4de9",
"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":
@@ -128,7 +128,7 @@
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/sparse_resources/CMakeLists.txt":
"0d64de8230844f6dfd44306993105f31",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt":
- "672bde36c1263be73ba59503021410d9",
+ "45857ee5183883971f8d53949f8d06b8",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ssbo/CMakeLists.txt":
"509295d2d41e74dc371ec29b221ee854",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/subgroups/CMakeLists.txt":
diff --git a/src/tests/deqp_support/deqp.gni b/src/tests/deqp_support/deqp.gni
index b5ae2f6022..c65d9ba894 100644
--- a/src/tests/deqp_support/deqp.gni
+++ b/src/tests/deqp_support/deqp.gni
@@ -871,6 +871,8 @@ deqp_khr_common_sources = [
"$deqp_path/external/openglcts/modules/common/glcBlendEquationAdvancedTests.hpp",
"$deqp_path/external/openglcts/modules/common/glcBufferObjectsTests.cpp",
"$deqp_path/external/openglcts/modules/common/glcBufferObjectsTests.hpp",
+ "$deqp_path/external/openglcts/modules/common/glcClipDistance.cpp",
+ "$deqp_path/external/openglcts/modules/common/glcClipDistance.hpp",
"$deqp_path/external/openglcts/modules/common/glcCompressedFormatTests.cpp",
"$deqp_path/external/openglcts/modules/common/glcCompressedFormatTests.hpp",
"$deqp_path/external/openglcts/modules/common/glcCompressedFormatTests_data.inl",
@@ -888,6 +890,8 @@ deqp_khr_common_sources = [
"$deqp_path/external/openglcts/modules/common/glcContext.hpp",
"$deqp_path/external/openglcts/modules/common/glcContextFlagsTests.cpp",
"$deqp_path/external/openglcts/modules/common/glcContextFlagsTests.hpp",
+ "$deqp_path/external/openglcts/modules/common/glcCullDistance.cpp",
+ "$deqp_path/external/openglcts/modules/common/glcCullDistance.hpp",
"$deqp_path/external/openglcts/modules/common/glcExposedExtensionsTests.cpp",
"$deqp_path/external/openglcts/modules/common/glcExposedExtensionsTests.hpp",
"$deqp_path/external/openglcts/modules/common/glcExtTokens.cpp",
@@ -1060,12 +1064,8 @@ deqp_khr_test_module_headers = [
]
deqp_khr_gl_sources = [
- "$deqp_path/external/openglcts/modules/gl/gl3cClipDistance.cpp",
- "$deqp_path/external/openglcts/modules/gl/gl3cClipDistance.hpp",
"$deqp_path/external/openglcts/modules/gl/gl3cCommonBugsTests.cpp",
"$deqp_path/external/openglcts/modules/gl/gl3cCommonBugsTests.hpp",
- "$deqp_path/external/openglcts/modules/gl/gl3cCullDistanceTests.cpp",
- "$deqp_path/external/openglcts/modules/gl/gl3cCullDistanceTests.hpp",
"$deqp_path/external/openglcts/modules/gl/gl3cGLSLnoperspectiveTests.cpp",
"$deqp_path/external/openglcts/modules/gl/gl3cGLSLnoperspectiveTests.hpp",
"$deqp_path/external/openglcts/modules/gl/gl3cGPUShader5Tests.cpp",
diff --git a/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt b/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt
index 7a9b640a43..2277ca7cb4 100644
--- a/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt
@@ -12,6 +12,8 @@
// Texture related failure on Pixel 4.
8616 VULKAN PIXEL4ORXL : KHR-GLES3.texture_lod_basic.lod_selection = FAIL
+341780527 VULKAN PIXEL4ORXL : KHR-GLES3.clip_distance.coverage = FAIL
+
// Test bug - fails in ASAN
6678 VULKAN ANDROID : KHR-GLES3.packed_pixels.varied_rectangle.* = SKIP
6678 VULKAN NVIDIA : KHR-GLES3.packed_pixels.varied_rectangle.r8_snorm = SKIP
@@ -20,6 +22,11 @@
5976 LINUX VULKAN NVIDIA : KHR-GLES3.shaders.indexing.tmp_array.vertexid = FAIL
+341780527 LINUX VULKAN NVIDIA : KHR-GLES3.clip_distance.coverage = FAIL
+341780527 LINUX VULKAN NVIDIA : KHR-GLES3.cull_distance.functional = FAIL
+341780527 WIN VULKAN NVIDIA : KHR-GLES3.clip_distance.coverage = FAIL
+341780527 WIN VULKAN NVIDIA : KHR-GLES3.cull_distance.functional = FAIL
+
// Fails only with SwiftShader:
// These only fail on Android
@@ -59,6 +66,9 @@
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
+341780527 SWIFTSHADER : KHR-GLES3.clip_distance.coverage = FAIL
+341780527 SWIFTSHADER : KHR-GLES3.clip_distance.functional = FAIL
+341780527 SWIFTSHADER : KHR-GLES3.cull_distance.functional = FAIL
// https://gitlab.khronos.org/opengl/API/-/issues/180
8048 VULKAN NVIDIA : KHR-GLES3.packed_pixels.pbo_rectangle.r8_snorm = SKIP