Manual roll VK-GL-CTS from c92e4b2608d4 to 75a6a8315e20 (14 revisions)
Includes manual ANGLE changes to reference new file names.
https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS.git/+log/c92e4b2608d4..75a6a8315e20
2024-01-08 lorenzo@khronosgroup.org Update external sources
2024-01-07 rgarcia@igalia.com More VK_EXT_host_image_copy tests with
depth/stencil buffers
2024-01-07 rgarcia@igalia.com Additional host image copy tests
2024-01-07 rgarcia@igalia.com Fix identical_memory_layout host image
copy tests
2024-01-07 james.fitzpatrick@imgtec.com Check for entry points
dependencies and validate all entry points from extensions
2024-01-07 rgarcia@igalia.com Add --quiet option to suppress standard
output messages
2024-01-07 lorenzo@khronosgroup.org Merge vk-gl-cts/vulkan-cts-1.3.7
into vk-gl-cts/main
2024-01-05 gleese@broadcom.com Allow VK_KHR_vertex_attribute_divisor
2024-01-05 jbolz@nvidia.com Disable KHR attrib_divisor tests for
VulkanSC
2024-01-05 cturner@igalia.com Populate all members of
StdVideoDecodeH265PictureInfoFlags
2024-01-05 eilif.swensen@arm.com Add external_format_resolve to
no_unknown_extensions
2024-01-05 marcin.hajder@mobica.com TransformFeedback API errors in
compatibility profiles
2024-01-05 lorenzo@khronosgroup.org Merge vk-gl-cts/vulkansc-cts-1.0.2
into vk-gl-cts/main
2024-01-02 aitor@lunarg.com Rename files/directories from master to main
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/vk-gl-cts-angle-autoroll
Please CC angle-team@google.com,cnorthrop@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
Bug: angleproject:8475
Change-Id: Iab2df38c310becb4785828d7129fe10c6d0228fc
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5177828
Commit-Queue: Cody Northrop <cnorthrop@google.com>
Reviewed-by: Yuxin Hu <yuxinhu@google.com>
diff --git a/DEPS b/DEPS
index baf64aa..0cf24b3 100644
--- a/DEPS
+++ b/DEPS
@@ -51,7 +51,7 @@
'dummy_checkout_chromium': False,
# Current revision of VK-GL-CTS (a.k.a dEQP).
- 'vk_gl_cts_revision': 'c92e4b2608d4e356d13541078e659a3a0f32483d',
+ 'vk_gl_cts_revision': '75a6a8315e20c07d72f5b34ddb3ec381aa839b17',
# Current revision of googletest.
# Note: this dep cannot be auto-rolled b/c of nesting.
diff --git a/doc/dEQP.md b/doc/dEQP.md
index dde7fde..e3620df 100644
--- a/doc/dEQP.md
+++ b/doc/dEQP.md
@@ -21,9 +21,9 @@
To run an individual test, use the `--gtest_filter` argument.
It supports simple wildcards. For example: `--gtest_filter=dEQP-GLES2.functional.shaders.linkage.*`.
-The tests lists are sourced from the Android CTS masters in
-`third_party/VK-GL-CTS/src/android/cts/master`. See `gles2-master.txt`,
-`gles3-master.txt`, `gles31-master.txt` and `egl-master.txt`.
+The tests lists are sourced from the Android CTS mains in
+`third_party/VK-GL-CTS/src/android/cts/main`. See `gles2-main.txt`,
+`gles3-main.txt`, `gles31-main.txt` and `egl-main.txt`.
If you're running a full test suite, it might take very long time. Running in
Debug is only useful to isolate and fix particular failures, Release will give
diff --git "a/scripts/code_generation_hashes/GL_CTS_\050dEQP\051_build_files.json" "b/scripts/code_generation_hashes/GL_CTS_\050dEQP\051_build_files.json"
index df7f2a2..d6cee28 100644
--- "a/scripts/code_generation_hashes/GL_CTS_\050dEQP\051_build_files.json"
+++ "b/scripts/code_generation_hashes/GL_CTS_\050dEQP\051_build_files.json"
@@ -50,7 +50,7 @@
"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":
- "154f46eda2b926c4215bac29d7c459bb",
+ "de4c5c3f2e9236fc77decb8476e44c3c",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/amber/CMakeLists.txt":
"51aed6000e6c76f2e4a5922e48841885",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/api/CMakeLists.txt":
diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn
index b145976..f416fb6 100644
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -1535,7 +1535,7 @@
template("angle_deqp_core_gtest") {
_api = target_name
forward_variables_from(invoker, [ "mustpass_suffix" ])
- if (mustpass_suffix != "master") {
+ if (mustpass_suffix != "main") {
target_name = "${_api}_${mustpass_suffix}"
target_name = string_replace(target_name, "-", "_")
}
@@ -1564,14 +1564,14 @@
defines = [ "ANGLE_DEQP_GLES2_TESTS" ]
deps = [ ":angle_deqp_gles2_common" ]
mustpass_dir = _aosp_gles_mustpass
- mustpass_suffix = "master"
+ mustpass_suffix = "main"
}
angle_deqp_core_gtest("gles3") {
defines = [ "ANGLE_DEQP_GLES3_TESTS" ]
deps = [ ":angle_deqp_gles3_common" ]
mustpass_dir = _aosp_gles_mustpass
- mustpass_suffix = "master"
+ mustpass_suffix = "main"
}
angle_deqp_core_gtest("gles3") {
@@ -1585,7 +1585,7 @@
defines = [ "ANGLE_DEQP_GLES31_TESTS" ]
deps = [ ":angle_deqp_gles31_common" ]
mustpass_dir = _aosp_gles_mustpass
- mustpass_suffix = "master"
+ mustpass_suffix = "main"
}
angle_deqp_core_gtest("gles31") {
@@ -1599,7 +1599,7 @@
defines = [ "ANGLE_DEQP_EGL_TESTS" ]
sources = deqp_egl_sources
mustpass_dir = _aosp_egl_mustpass
- mustpass_suffix = "master"
+ mustpass_suffix = "main"
}
if (is_android) {
@@ -1685,32 +1685,32 @@
angle_deqp_khr_gtest("khr_gles2") {
defines = [ "ANGLE_DEQP_KHR_GLES2_TESTS" ]
- mustpass_name = "gles2-khr-master.txt"
+ mustpass_name = "gles2-khr-main.txt"
api = "gles2"
}
angle_deqp_khr_gtest("khr_gles3") {
defines = [ "ANGLE_DEQP_KHR_GLES3_TESTS" ]
- mustpass_name = "gles3-khr-master.txt"
+ mustpass_name = "gles3-khr-main.txt"
api = "gles3"
}
angle_deqp_khr_gtest("khr_gles31") {
defines = [ "ANGLE_DEQP_KHR_GLES31_TESTS" ]
- mustpass_name = "gles31-khr-master.txt"
+ mustpass_name = "gles31-khr-main.txt"
api = "gles31"
}
angle_deqp_khr_gtest("khr_gles32") {
defines = [ "ANGLE_DEQP_KHR_GLES32_TESTS" ]
- mustpass_name = "gles32-khr-master.txt"
+ mustpass_name = "gles32-khr-main.txt"
api = "gles32"
}
# The core Desktop GL CTS is in the same category as these KHR tests.
angle_deqp_khr_gtest("gl46") {
defines = [ "ANGLE_DEQP_GL_TESTS" ]
- mustpass_name = "gl46-master.txt"
+ mustpass_name = "gl46-main.txt"
api = "gl46"
}
@@ -1733,13 +1733,13 @@
angle_deqp_khr_noctx_gtest("khr_noctx_gles2") {
defines = [ "ANGLE_DEQP_KHR_NOCTX_GLES2_TESTS" ]
- mustpass_name = "gles2-khr-noctx-master.txt"
+ mustpass_name = "gles2-khr-noctx-main.txt"
api = "gles2"
}
angle_deqp_khr_noctx_gtest("khr_noctx_gles32") {
defines = [ "ANGLE_DEQP_KHR_NOCTX_GLES32_TESTS" ]
- mustpass_name = "gles32-khr-noctx-master.txt"
+ mustpass_name = "gles32-khr-noctx-main.txt"
api = "gles32"
}
diff --git a/src/tests/deqp_support/angle_deqp_gtest.cpp b/src/tests/deqp_support/angle_deqp_gtest.cpp
index fc96df4..ab41132 100644
--- a/src/tests/deqp_support/angle_deqp_gtest.cpp
+++ b/src/tests/deqp_support/angle_deqp_gtest.cpp
@@ -64,16 +64,16 @@
#define EGL_CTS_DIR(PATH) "external/openglcts/data/mustpass/egl/" PATH
const char *gCaseListFiles[] = {
- EGL_CTS_DIR("aosp_mustpass/main/egl-master.txt"),
- GLES_CTS_DIR("aosp_mustpass/main/gles2-master.txt"),
- GLES_CTS_DIR("aosp_mustpass/main/gles3-master.txt"),
- GLES_CTS_DIR("aosp_mustpass/main/gles31-master.txt"),
- GLES_CTS_DIR("khronos_mustpass/main/gles2-khr-master.txt"),
- GLES_CTS_DIR("khronos_mustpass/main/gles3-khr-master.txt"),
- GLES_CTS_DIR("khronos_mustpass/main/gles31-khr-master.txt"),
- GLES_CTS_DIR("khronos_mustpass/main/gles32-khr-master.txt"),
- GLES_CTS_DIR("khronos_mustpass_noctx/main/gles2-khr-noctx-master.txt"),
- GLES_CTS_DIR("khronos_mustpass_noctx/main/gles32-khr-noctx-master.txt"),
+ EGL_CTS_DIR("aosp_mustpass/main/egl-main.txt"),
+ GLES_CTS_DIR("aosp_mustpass/main/gles2-main.txt"),
+ GLES_CTS_DIR("aosp_mustpass/main/gles3-main.txt"),
+ GLES_CTS_DIR("aosp_mustpass/main/gles31-main.txt"),
+ GLES_CTS_DIR("khronos_mustpass/main/gles2-khr-main.txt"),
+ GLES_CTS_DIR("khronos_mustpass/main/gles3-khr-main.txt"),
+ GLES_CTS_DIR("khronos_mustpass/main/gles31-khr-main.txt"),
+ GLES_CTS_DIR("khronos_mustpass/main/gles32-khr-main.txt"),
+ GLES_CTS_DIR("khronos_mustpass_noctx/main/gles2-khr-noctx-main.txt"),
+ GLES_CTS_DIR("khronos_mustpass_noctx/main/gles32-khr-noctx-main.txt"),
GLES_CTS_DIR("khronos_mustpass_single/main/gles32-khr-single.txt"),
GLES_CTS_DIR("aosp_mustpass/main/gles3-rotate-landscape.txt"),
GLES_CTS_DIR("aosp_mustpass/main/gles3-rotate-reverse-portrait.txt"),
@@ -85,7 +85,7 @@
GLES_CTS_DIR("aosp_mustpass/main/gles3-565-no-depth-no-stencil.txt"),
GLES_CTS_DIR("aosp_mustpass/main/gles31-multisample.txt"),
GLES_CTS_DIR("aosp_mustpass/main/gles31-565-no-depth-no-stencil.txt"),
- GL_CTS_DIR("khronos_mustpass/main/gl46-master.txt"),
+ GL_CTS_DIR("khronos_mustpass/main/gl46-main.txt"),
};
const std::vector<const char *> gTestSuiteConfigParameters[] = {
diff --git a/third_party/VK-GL-CTS/src b/third_party/VK-GL-CTS/src
index c92e4b2..75a6a83 160000
--- a/third_party/VK-GL-CTS/src
+++ b/third_party/VK-GL-CTS/src
@@ -1 +1 @@
-Subproject commit c92e4b2608d4e356d13541078e659a3a0f32483d
+Subproject commit 75a6a8315e20c07d72f5b34ddb3ec381aa839b17
