Skip to content

A
angle
Commit 1a146f07 by Shahbaz Youssefi Committed by Commit Bot
Options

Roll VK-GL-CTS from c4e6dbe68e04 to ededa67cb12a (76 revisions)

https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS.git/+log/c4e6dbe68e04..ededa67cb12a 2021-04-13 timvp@google.com Always include sys/system_properties.h for Android 2021-04-09 juha.heiskanen@siru.fi Add primitive topologies for XFB query tests 2021-04-09 alexander.galazin@arm.com Merge vk-gl-cts/github-master into vk-gl-cts/master 2021-04-09 s.fricke@samsung.com Add OpImageQuerySamples with Storage Image test 2021-04-09 jdarpinian@chromium.org EXT_multisampled_render_to_texture test using ReadPixels 2021-04-08 alexander.galazin@arm.com Merge vk-gl-cts/opengl-es-cts-3.2.7 into vk-gl-cts/master 2021-04-08 alexander.galazin@arm.com Merge vk-gl-cts/opengl-cts-4.6.0 into vk-gl-cts/master 2021-04-07 alexander.galazin@arm.com Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-gl-cts/master 2021-04-07 jajones@nvidia.com Add CMake detection logic for libdrm include files 2021-04-02 juha.heiskanen@siru.fi Add early fragment tests 2021-04-02 michal.jakubek@mobica.com Add tests for multisample resolve to level != 0 2021-04-02 boris.zanin@mobica.com Add coverage for 1D, 1D array and Cube array shadow images 2021-04-02 boris.zanin@mobica.com Add subgroup testing for ray tracing pipelines 2021-04-02 caio.oliveira@intel.com Test interaction between Workgroup explicit layout and zero initialization 2021-04-02 Alexander.Galazin@arm.com Merge "Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-gl-cts/master" 2021-04-02 cheryl.wei@arm.com Add waived tests support for cts tools 2021-04-01 rgarcia@igalia.com Remove duplicate dataSafe function from deSTLUtil 2021-04-01 boris.zanin@mobica.com Add keys deqp-log-decompiled-spirv and deqp-log-empty-loginfo 2021-04-01 apinheiro@igalia.com Check for drawIndirectFirstInstance should only affect indirect draw calls 2021-03-31 alexander.galazin@arm.com Support GL 4.5 in the uniform location tests 2021-03-31 alexander.galazin@arm.com Support GL 4.5 in the multisample texture tests 2021-03-31 alexander.galazin@arm.com Support GL 4.5 in the EXT_texture_border_clamp tests 2021-03-30 alexander.galazin@arm.com Update Vulkan headers 2021-03-30 alexander.galazin@arm.com Support GL 4.5 in the geometry shading tests 2021-03-30 alexander.galazin@arm.com Support GL 4.5 in the tessellation tests 2021-03-30 alexander.galazin@arm.com Merge vk-gl-cts/opengl-es-cts-3.2.7 into vk-gl-cts/master 2021-03-30 alexander.galazin@arm.com Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-gl-cts/master 2021-03-30 alexander.galazin@arm.com Support GL 4.5 in the copy image tests 2021-03-26 michal.jakubek@mobica.com Added tests for most-negative snorm values in images 2021-03-26 alexander.galazin@arm.com Notice of withdrawal of Vulkan CTS 1.2.2.x 2021-03-25 timvp@google.com Include sys/system_properties.h in teglAndroidUtil.cpp 2021-03-25 afdx@google.com Add a batch of GraphicsFuzz tests 2021-03-25 alexander.galazin@arm.com Merge vk-gl-cts/opengl-es-cts-3.2.7 into vk-gl-cts/master 2021-03-25 rgarcia@igalia.com QPA image viewer updates 2021-03-25 boris.zanin@mobica.com Fulfill OpControlBarrier requirement 2021-03-25 slawomir.cygan@intel.com Add an option to terminate after first failure, update READMEs 2021-03-25 slawomir.cygan@intel.com Terminate with an error if unrecognized arguments are passed to dEQP executable 2021-03-25 venni.ihanakangas@siru.fi Ensure only Unix paths are added to deqp.apk 2021-03-19 alexander.galazin@arm.com Merge vk-gl-cts/github-master into vk-gl-cts/master 2021-03-19 jbolz@nvidia.com Add tests to exercise 'readonly' SSBOs 2021-03-18 alexander.galazin@arm.com Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/master 2021-03-18 slawomir.cygan@intel.com Fix required features checks in shaderRecordExplicitScalarOffset_6 test case 2021-03-18 tom.cooper@arm.com Add VK_EXT_headless_surface surface tests 2021-03-18 Junda.Liu@amd.com Fix robust buffer access result checking for partially out of bound cases 2021-03-18 tapani.palli@intel.com Use linear tiling with external_memory_host tests 2021-03-18 ancheng.qiao@arm.com Fix precision issue in NearestEdgeTests shaders 2021-03-17 alexander.galazin@arm.com Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/master 2021-03-17 gleese@broadcom.com Enable shadow filtering tests for non-filterable formats 2021-03-17 rgarcia@igalia.com Add BGR and BGRA formats to image view tests 2021-03-17 alexander.galazin@arm.com Merge vk-gl-cts/opengl-es-cts-3.2.7 into vk-gl-cts/master 2021-03-17 jari.komppa@siru.fi Add tests for standard multisample positions 2021-03-17 rgarcia@igalia.com Push constant overwrite tests 2021-03-17 rgarcia@igalia.com Test large command buffers with many draw commands 2021-03-17 rgarcia@igalia.com Test barycentric coordinates in ray tracing hits 2021-03-17 rgarcia@igalia.com Add missing mandatory features 2021-03-17 venni.ihanakangas@siru.fi Ensure WSI colorspace has no effect on image contents 2021-03-17 tapani.palli@intel.com reset minSampleShading only with OpenGL Core 4.0+ 2021-03-16 alexander.galazin@arm.com Merge vk-gl-cts/opengl-es-cts-3.2.7 into vk-gl-cts/master 2021-03-16 alexander.galazin@arm.com Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/master 2021-03-16 alexander.galazin@arm.com Merge vk-gl-cts/opengl-cts-4.6.0 into vk-gl-cts/master 2021-03-15 rgarcia@igalia.com Enable validation for all custom devices 2021-03-15 rgarcia@igalia.com Remove multiview requirement in extended dyn state tests 2021-03-15 boris.zanin@mobica.com Fix recursion depth requirement in complexcontrolflow 2021-03-15 rgarcia@igalia.com Check image extent support in watertightness tests 2021-03-15 boris.zanin@mobica.com Read deserealization size from stream 2021-03-15 gleese@broadcom.com Fix flush/invalidate in mismatched_write_op tests 2021-03-15 gleese@broadcom.com Fix sync validation for mismatched_write_op tests 2021-03-15 tapani.palli@intel.com Check if image sample count supported by VkSampleCountFlags 2021-03-15 rgarcia@igalia.com Always accumulate errors in desc set random tests 2021-03-15 syoussefi@google.com Fix missing barrier in compute test 2021-03-15 syoussefi@google.com Fix missing barrier in texture buffer test 2021-03-15 ari.suonpaa@siru.fi Replace libUI with native Android AHB API 2021-03-10 gleese@broadcom.com Add a waiver for depth bias on some Broadcom GPUs 2021-03-10 alexander.galazin@arm.com Update Vulkan/GL Readme 2021-03-10 ari.suonpaa@siru.fi Update Amber 2021-03-08 toni.salmivalli@siru.fi Add a batch of Graphicsfuzz tests 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 syoussefi@google.com,angle-bots+autoroll-info@google.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md Bug: angleproject:5816 Change-Id: I324ce9596a62771726dc4504b2341e049818f7de Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2807533Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent c782ef19
Showing with 26 additions and 16 deletions
DEPS
...@@ -29,7 +29,7 @@ vars = { ...@@ -29,7 +29,7 @@ vars = {
'dummy_checkout_chromium': False, 'dummy_checkout_chromium': False,
# Current revision of VK-GL-CTS (a.k.a dEQP). # Current revision of VK-GL-CTS (a.k.a dEQP).
'vk_gl_cts_revision': 'c4e6dbe68e043d6697f60768baf5b2876c6596c6', 'vk_gl_cts_revision': 'ededa67cb12aec0c5e92e3eba40d3f3c7b4d697f',
# Current revision of googletest. # Current revision of googletest.
# Note: this dep cannot be auto-rolled b/c of nesting. # Note: this dep cannot be auto-rolled b/c of nesting.
......
scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"src/tests/deqp_support/deqp_data_autogen.gni": "src/tests/deqp_support/deqp_data_autogen.gni":
"3a74e9e404a9b1a4ff1a78d8a640c472", "3a74e9e404a9b1a4ff1a78d8a640c472",
"third_party/VK-GL-CTS/src/CMakeLists.txt": "third_party/VK-GL-CTS/src/CMakeLists.txt":
"c7a733365029f77382d34a1f55c8fbd1", "949042acfa4a257f7ea1126681d59d2e",
"third_party/VK-GL-CTS/src/execserver/CMakeLists.txt": "third_party/VK-GL-CTS/src/execserver/CMakeLists.txt":
"38aa187592e6ef9a331fc1ea313fc68d", "38aa187592e6ef9a331fc1ea313fc68d",
"third_party/VK-GL-CTS/src/executor/CMakeLists.txt": "third_party/VK-GL-CTS/src/executor/CMakeLists.txt":
...@@ -96,9 +96,9 @@ ...@@ -96,9 +96,9 @@
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/rasterization/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/rasterization/CMakeLists.txt":
"13850a7e8d1f12fc9d1ba5b3314c54eb", "13850a7e8d1f12fc9d1ba5b3314c54eb",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ray_query/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ray_query/CMakeLists.txt":
"93b1670e6e54c125ed659fd46da18ed9", "5e106b9d055144bc4db2e3e478191a5c",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ray_tracing/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ray_tracing/CMakeLists.txt":
"41033012125348ad28fc3a1b0f2e81e3", "53b436e7a42e17135503b8fe5491c679",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/renderpass/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/renderpass/CMakeLists.txt":
"154254ec9d21124a3ef46ad9e5cb1829", "154254ec9d21124a3ef46ad9e5cb1829",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/robustness/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/robustness/CMakeLists.txt":
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
"third_party/VK-GL-CTS/src/framework/opengl/wrapper/CMakeLists.txt": "third_party/VK-GL-CTS/src/framework/opengl/wrapper/CMakeLists.txt":
"31a7adfb6e907b53ef24bb6ea044b838", "31a7adfb6e907b53ef24bb6ea044b838",
"third_party/VK-GL-CTS/src/framework/platform/CMakeLists.txt": "third_party/VK-GL-CTS/src/framework/platform/CMakeLists.txt":
"61165590822c668da40db99db8f2b45b", "1abeb4f05ee0db1fccfa002957b10c2f",
"third_party/VK-GL-CTS/src/framework/qphelper/CMakeLists.txt": "third_party/VK-GL-CTS/src/framework/qphelper/CMakeLists.txt":
"e5d27635282f53b760c13cc68374e586", "e5d27635282f53b760c13cc68374e586",
"third_party/VK-GL-CTS/src/framework/randomshaders/CMakeLists.txt": "third_party/VK-GL-CTS/src/framework/randomshaders/CMakeLists.txt":
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
"third_party/VK-GL-CTS/src/modules/gles2/accuracy/CMakeLists.txt": "third_party/VK-GL-CTS/src/modules/gles2/accuracy/CMakeLists.txt":
"a6677806fdbde7ecb6c61aced41d4bed", "a6677806fdbde7ecb6c61aced41d4bed",
"third_party/VK-GL-CTS/src/modules/gles2/functional/CMakeLists.txt": "third_party/VK-GL-CTS/src/modules/gles2/functional/CMakeLists.txt":
"7c30918f4517fe75af1c0681be2244a0", "e9acbb5a31fcba3dfe637ae31ac23a62",
"third_party/VK-GL-CTS/src/modules/gles2/performance/CMakeLists.txt": "third_party/VK-GL-CTS/src/modules/gles2/performance/CMakeLists.txt":
"c62305ca30bf2a2af2d728ac8617bfce", "c62305ca30bf2a2af2d728ac8617bfce",
"third_party/VK-GL-CTS/src/modules/gles2/stress/CMakeLists.txt": "third_party/VK-GL-CTS/src/modules/gles2/stress/CMakeLists.txt":
......
src/tests/BUILD.gn
...@@ -918,9 +918,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -918,9 +918,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
"/wd4996", # deprecated "/wd4996", # deprecated
] ]
} }
if (is_android) {
include_dirs += [ "$deqp_path/framework/platform/android" ]
}
defines = [ defines = [
"DEQP_SUPPORT_GLES31=1", "DEQP_SUPPORT_GLES31=1",
"DEQP_SUPPORT_GLES3=1", "DEQP_SUPPORT_GLES3=1",
...@@ -936,6 +934,17 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -936,6 +934,17 @@ if (build_angle_deqp_tests && !is_fuchsia) {
"ANGLE_DEQP_DATA_DIR=\"gen/vk_gl_cts_data/data\"", "ANGLE_DEQP_DATA_DIR=\"gen/vk_gl_cts_data/data\"",
] ]
if (is_android) {
include_dirs += [ "$deqp_path/framework/platform/android" ]
_android_api = android64_ndk_api_level
if (!angle_64bit_current_cpu) {
_android_api = android32_ndk_api_level
}
defines += [ "DE_ANDROID_API=" + "${_android_api}" ]
}
if (is_clang) { if (is_clang) {
# TODO(jmadill): Remove this once we fix dEQP. # TODO(jmadill): Remove this once we fix dEQP.
cflags_c = [ "-Wno-unused-local-typedef" ] cflags_c = [ "-Wno-unused-local-typedef" ]
...@@ -1193,7 +1202,6 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -1193,7 +1202,6 @@ if (build_angle_deqp_tests && !is_fuchsia) {
] ]
sources = deqp_libtester_sources sources = deqp_libtester_sources
if (is_android) { if (is_android) {
sources += deqp_libtester_sources_android
libs = [ "log" ] libs = [ "log" ]
} }
} }
......
src/tests/deqp_support/deqp.gni
...@@ -26,6 +26,7 @@ deqp_include_dirs = [ ...@@ -26,6 +26,7 @@ deqp_include_dirs = [
"$deqp_path/modules/gles31/functional", "$deqp_path/modules/gles31/functional",
"$deqp_path/modules/gles31/stress", "$deqp_path/modules/gles31/stress",
"$deqp_path/modules/glusecases", "$deqp_path/modules/glusecases",
"$deqp_path/modules/egl",
"${angle_glslang_dir}", "${angle_glslang_dir}",
"${angle_spirv_tools_dir}", "${angle_spirv_tools_dir}",
] ]
...@@ -101,6 +102,8 @@ deqp_gles2_sources = [ ...@@ -101,6 +102,8 @@ deqp_gles2_sources = [
"$deqp_path/modules/gles2/functional/es2fLightAmountTest.hpp", "$deqp_path/modules/gles2/functional/es2fLightAmountTest.hpp",
"$deqp_path/modules/gles2/functional/es2fMultisampleTests.cpp", "$deqp_path/modules/gles2/functional/es2fMultisampleTests.cpp",
"$deqp_path/modules/gles2/functional/es2fMultisampleTests.hpp", "$deqp_path/modules/gles2/functional/es2fMultisampleTests.hpp",
"$deqp_path/modules/gles2/functional/es2fMultisampledRenderToTextureTests.cpp",
"$deqp_path/modules/gles2/functional/es2fMultisampledRenderToTextureTests.hpp",
"$deqp_path/modules/gles2/functional/es2fNegativeBufferApiTests.cpp", "$deqp_path/modules/gles2/functional/es2fNegativeBufferApiTests.cpp",
"$deqp_path/modules/gles2/functional/es2fNegativeBufferApiTests.hpp", "$deqp_path/modules/gles2/functional/es2fNegativeBufferApiTests.hpp",
"$deqp_path/modules/gles2/functional/es2fNegativeFragmentApiTests.cpp", "$deqp_path/modules/gles2/functional/es2fNegativeFragmentApiTests.cpp",
...@@ -748,7 +751,8 @@ deqp_gles31_sources = [ ...@@ -748,7 +751,8 @@ deqp_gles31_sources = [
] ]
deqp_egl_sources = [ deqp_egl_sources = [
"$deqp_path/modules/egl/teglAndroidUtil.cpp", # "$deqp_path/modules/egl/teglAndroidUtil.cpp", # anglebug.com/5816: build failure. Fixed in
# https://gerrit.khronos.org/c/vk-gl-cts/+/7296
"$deqp_path/modules/egl/teglAndroidUtil.hpp", "$deqp_path/modules/egl/teglAndroidUtil.hpp",
"$deqp_path/modules/egl/teglApiCase.cpp", "$deqp_path/modules/egl/teglApiCase.cpp",
"$deqp_path/modules/egl/teglApiCase.hpp", "$deqp_path/modules/egl/teglApiCase.hpp",
...@@ -851,6 +855,9 @@ deqp_egl_sources = [ ...@@ -851,6 +855,9 @@ deqp_egl_sources = [
"$deqp_path/modules/egl/teglVGRenderUtil.hpp", "$deqp_path/modules/egl/teglVGRenderUtil.hpp",
"$deqp_path/modules/egl/teglWideColorTests.cpp", "$deqp_path/modules/egl/teglWideColorTests.cpp",
"$deqp_path/modules/egl/teglWideColorTests.hpp", "$deqp_path/modules/egl/teglWideColorTests.hpp",
# Overrides
"deqp_support//teglAndroidUtil_override.cpp", # anglebug.com/5816
] ]
deqp_khr_common_sources = [ deqp_khr_common_sources = [
...@@ -2015,8 +2022,3 @@ deqp_libtester_sources = [ ...@@ -2015,8 +2022,3 @@ deqp_libtester_sources = [
"deqp_support/tcuRandomOrderExecutor.cpp", "deqp_support/tcuRandomOrderExecutor.cpp",
"deqp_support/tcuRandomOrderExecutor.h", "deqp_support/tcuRandomOrderExecutor.h",
] ]
deqp_libtester_sources_android = [
"$deqp_path/framework/platform/android/tcuAndroidInternals.cpp",
"$deqp_path/framework/platform/android/tcuAndroidInternals.hpp",
]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment