diff options
Diffstat (limited to 'chromium/third_party/angle/src/tests')
8 files changed, 75 insertions, 13 deletions
diff --git a/chromium/third_party/angle/src/tests/BUILD.gn b/chromium/third_party/angle/src/tests/BUILD.gn index 47107846da7..e5c3879bcd7 100644 --- a/chromium/third_party/angle/src/tests/BUILD.gn +++ b/chromium/third_party/angle/src/tests/BUILD.gn @@ -93,6 +93,10 @@ template("angle_common_test_utils") { "test_utils/angle_test_instantiate_apple.mm", ] } + data_deps = [] + if (angle_enable_vulkan) { + data_deps += [ "$angle_root/src/common/vulkan:vulkan_validation_layers" ] + } } } @@ -174,10 +178,7 @@ if (is_win || is_linux || is_mac || is_android || is_fuchsia) { "test_utils/VulkanExternalHelper.cpp", "test_utils/VulkanExternalHelper.h", ] - deps += [ - "$angle_root/src/common/vulkan", - "$angle_root/src/libANGLE/renderer/vulkan:angle_vulkan_entry_points", - ] + deps += [ "$angle_root/src/common/vulkan" ] } if (is_fuchsia) { @@ -213,9 +214,7 @@ if (is_win || is_linux || is_mac || is_android) { if (angle_enable_vulkan) { sources += angle_white_box_tests_vulkan_sources - deps += [ - "$angle_root/src/libANGLE/renderer/vulkan:angle_vulkan_entry_points", - ] + deps += [ "$angle_root/src/common/vulkan:angle_vulkan_entry_points" ] } } } @@ -274,7 +273,7 @@ if (is_win || is_linux || is_android || is_mac) { sources += angle_white_box_perf_tests_vulkan_sources deps += [ "$angle_glslang_dir:glslang_sources", - "$angle_root/src/libANGLE/renderer/vulkan:angle_vulkan_entry_points", + "$angle_root/src/common/vulkan:angle_vulkan_entry_points", ] } } @@ -399,7 +398,6 @@ if (build_angle_gles1_conform_tests) { "$gles1_conform_root/conform/conformshell", "$gles1_conform_root/ctk", "$gles1_conform_root/fixed", - "$gles1_conform_root/include", "$gles1_conform_root/platform", ] @@ -748,10 +746,7 @@ if (build_angle_gles1_conform_tests) { ":angle_gles1_primtest_no_gtest", ] - include_dirs = [ - ".", - "$gles1_conform_root/conform", - ] + include_dirs = [ "$gles1_conform_root/conform" ] sources = [ "gles1_conformance_tests/PrimtestTests.cpp", @@ -1348,6 +1343,7 @@ group("angle_tests") { ":angle_end2end_tests", ":angle_perftests", ":angle_unittests", + "capture_replay_tests", ] if (!is_fuchsia) { deps += [ diff --git a/chromium/third_party/angle/src/tests/angle_end2end_tests.gni b/chromium/third_party/angle/src/tests/angle_end2end_tests.gni index 8e9e4b387af..d693a96b4a7 100644 --- a/chromium/third_party/angle/src/tests/angle_end2end_tests.gni +++ b/chromium/third_party/angle/src/tests/angle_end2end_tests.gni @@ -12,6 +12,7 @@ angle_end2end_tests_sources = [ "egl_tests/EGLCreateContextAttribsTest.cpp", "egl_tests/EGLDebugTest.cpp", "egl_tests/EGLNoConfigContextTest.cpp", + "egl_tests/EGLPreRotationTest.cpp", "egl_tests/EGLPrintEGLinfoTest.cpp", "egl_tests/EGLProgramCacheControlTest.cpp", "egl_tests/EGLQueryContextTest.cpp", @@ -93,6 +94,7 @@ angle_end2end_tests_sources = [ "gl_tests/PackUnpackTest.cpp", "gl_tests/ParallelShaderCompileTest.cpp", "gl_tests/PbufferTest.cpp", + "gl_tests/PixmapTest.cpp", "gl_tests/PointSpritesTest.cpp", "gl_tests/ProgramBinaryTest.cpp", "gl_tests/ProgramInterfaceTest.cpp", @@ -119,6 +121,7 @@ angle_end2end_tests_sources = [ "gl_tests/SwizzleTest.cpp", "gl_tests/SyncQueriesTest.cpp", "gl_tests/TextureExternalUpdateTest.cpp", + "gl_tests/TextureFilteringHintTest.cpp", "gl_tests/TextureMultisampleTest.cpp", "gl_tests/TextureRectangleTest.cpp", "gl_tests/TextureTest.cpp", diff --git a/chromium/third_party/angle/src/tests/angle_perftests.gni b/chromium/third_party/angle/src/tests/angle_perftests.gni index 665f6d7c465..e64a7f9e186 100644 --- a/chromium/third_party/angle/src/tests/angle_perftests.gni +++ b/chromium/third_party/angle/src/tests/angle_perftests.gni @@ -12,6 +12,7 @@ angle_perf_tests_sources = [ "perf_tests/DrawElementsPerf.cpp", "perf_tests/DynamicPromotionPerfTest.cpp", "perf_tests/EGLMakeCurrentPerf.cpp", + "perf_tests/GenerateMipmapPerf.cpp", "perf_tests/IndexConversionPerf.cpp", "perf_tests/InstancingPerf.cpp", "perf_tests/InterleavedAttributeData.cpp", diff --git a/chromium/third_party/angle/src/tests/angle_unittests.gni b/chromium/third_party/angle/src/tests/angle_unittests.gni index a1465ccf673..021f620c2be 100644 --- a/chromium/third_party/angle/src/tests/angle_unittests.gni +++ b/chromium/third_party/angle/src/tests/angle_unittests.gni @@ -80,6 +80,7 @@ angle_unittests_sources = [ "compiler_tests/IntermNode_test.cpp", "compiler_tests/NV_draw_buffers_test.cpp", "compiler_tests/OES_standard_derivatives_test.cpp", + "compiler_tests/OES_texture_cube_map_array_test.cpp", "compiler_tests/OVR_multiview2_test.cpp", "compiler_tests/OVR_multiview_test.cpp", "compiler_tests/Pack_Unpack_test.cpp", diff --git a/chromium/third_party/angle/src/tests/angle_white_box_tests.gni b/chromium/third_party/angle/src/tests/angle_white_box_tests.gni index 6d1208ec6f7..88a7c05242c 100644 --- a/chromium/third_party/angle/src/tests/angle_white_box_tests.gni +++ b/chromium/third_party/angle/src/tests/angle_white_box_tests.gni @@ -19,5 +19,6 @@ angle_white_box_tests_win_sources = [ ] angle_white_box_tests_vulkan_sources = [ "gl_tests/VulkanFormatTablesTest.cpp", + "gl_tests/VulkanFramebufferTest.cpp", "gl_tests/VulkanUniformUpdatesTest.cpp", ] diff --git a/chromium/third_party/angle/src/tests/capture_replay_tests/BUILD.gn b/chromium/third_party/angle/src/tests/capture_replay_tests/BUILD.gn new file mode 100644 index 00000000000..f88a3d3e10e --- /dev/null +++ b/chromium/third_party/angle/src/tests/capture_replay_tests/BUILD.gn @@ -0,0 +1,54 @@ +# Copyright 2020 The ANGLE Project Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("../../../gni/angle.gni") +declare_args() { + # Determines if we build the capture_replay_tests. Off by default. + angle_build_capture_replay_tests = false + + # Decide which context to replay, starting with desktop default + angle_capture_replay_test_context_id = 1 +} + +if (angle_build_capture_replay_tests) { + # TODO (nguyenmh): http://anglebug.com/4758: + # turn angle_executable into angle_test when adding android support + angle_executable("capture_replay_tests") { + testonly = true + _contextid = angle_capture_replay_test_context_id + _trace_sources = + read_file("traces/angle_capture_context${_contextid}_files.txt", + "list lines") + + [ + "angle_capture_context${_contextid}.cpp", + "angle_capture_context${_contextid}.h", + ] + sources = + rebase_path(_trace_sources, ".", "traces") + [ "CaptureReplayTest.cpp" ] + deps = [ + "$angle_root:angle_compression", + "../../../:angle_common", + "../../../util:angle_util", + "../../../util:angle_util_loader_headers", + ] + configs += [ "../../../:library_name_config" ] + + suppressed_configs += [ "$angle_root:constructor_and_destructor_warnings" ] + + # Disable optimization to avoid optimizing huge files. + if (!is_debug) { + suppressed_configs += [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:no_optimize" ] + } + _data_path = rebase_path("traces", root_out_dir) + defines = [ + "ANGLE_CAPTURE_REPLAY_TEST_DATA_DIR=\"${_data_path}\"", + "ANGLE_CAPTURE_REPLAY_TEST_CONTEXT_ID=${_contextid}", + "ANGLE_CAPTURE_REPLAY_TEST_HEADER=traces/angle_capture_context${_contextid}.h", + ] + } +} else { + group("capture_replay_tests") { + } +} diff --git a/chromium/third_party/angle/src/tests/deqp_support/deqp.gni b/chromium/third_party/angle/src/tests/deqp_support/deqp.gni index cac232f5dfe..253ffb0dc8d 100644 --- a/chromium/third_party/angle/src/tests/deqp_support/deqp.gni +++ b/chromium/third_party/angle/src/tests/deqp_support/deqp.gni @@ -904,6 +904,8 @@ deqp_khr_common_sources = [ "$deqp_path/external/openglcts/modules/common/glcPackedPixelsTests.hpp", "$deqp_path/external/openglcts/modules/common/glcParallelShaderCompileTests.cpp", "$deqp_path/external/openglcts/modules/common/glcParallelShaderCompileTests.hpp", + "$deqp_path/external/openglcts/modules/common/glcPixelStorageModesTests.cpp", + "$deqp_path/external/openglcts/modules/common/glcPixelStorageModesTests.hpp", "$deqp_path/external/openglcts/modules/common/glcPolygonOffsetClampTests.cpp", "$deqp_path/external/openglcts/modules/common/glcPolygonOffsetClampTests.hpp", "$deqp_path/external/openglcts/modules/common/glcRobustBufferAccessBehaviorTests.cpp", diff --git a/chromium/third_party/angle/src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni b/chromium/third_party/angle/src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni index fa4e3ae6f5b..c81fabd0d41 100644 --- a/chromium/third_party/angle/src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni +++ b/chromium/third_party/angle/src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni @@ -9,7 +9,11 @@ # Can be consumed by tests/BUILD.gn. angle_restricted_traces = [ + "angry_birds_2_1500 3", + "candy_crush_500 2", + "egypt_1500 1", "manhattan_10 1", + "subway_surfer_500 4", "temple_run_300 3", "trex_200 1", ] |