Skip to content

A
angle
Commit 973ade8d by Shahbaz Youssefi Committed by Commit Bot
Options

Optimize building prerotation deqp targets

Uses source_set to share the objects created for non rotated targets. As a bonus, dEQP itself is no longer built with ANGLE_DEQP_* defines. Bug: angleproject:4901 Change-Id: I2319116e478be39150fac32a85a43787c050c76f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2540829Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent bb54223b
Showing with 35 additions and 11 deletions
src/tests/BUILD.gn
...@@ -1206,6 +1206,30 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -1206,6 +1206,30 @@ if (build_angle_deqp_tests && !is_fuchsia) {
_khronos_mustpass = _khronos_mustpass =
"$deqp_path/external/openglcts/data/mustpass/gles/khronos_mustpass/master" "$deqp_path/external/openglcts/data/mustpass/gles/khronos_mustpass/master"
angle_deqp_source_set("angle_deqp_gles2_common") {
sources = deqp_gles2_sources
public_deps = [
":angle_deqp_framework_egl",
":angle_deqp_glshared",
]
}
angle_deqp_source_set("angle_deqp_gles3_common") {
sources = deqp_gles3_sources
public_deps = [
":angle_deqp_framework_egl",
":angle_deqp_glshared",
]
}
angle_deqp_source_set("angle_deqp_gles31_common") {
sources = deqp_gles31_sources
public_deps = [
":angle_deqp_framework_egl",
":angle_deqp_glshared",
]
}
template("angle_deqp_core_gtest") { template("angle_deqp_core_gtest") {
_api = target_name _api = target_name
angle_deqp_gtest(target_name) { angle_deqp_gtest(target_name) {
...@@ -1213,7 +1237,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -1213,7 +1237,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
mustpass_name = "${_api}-master.txt" mustpass_name = "${_api}-master.txt"
deps = angle_deqp_data_copy_targets deps += angle_deqp_data_copy_targets
data = [] data = []
if (_api == "gles2") { if (_api == "gles2") {
...@@ -1231,19 +1255,19 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -1231,19 +1255,19 @@ if (build_angle_deqp_tests && !is_fuchsia) {
angle_deqp_core_gtest("gles2") { angle_deqp_core_gtest("gles2") {
defines = [ "ANGLE_DEQP_GLES2_TESTS" ] defines = [ "ANGLE_DEQP_GLES2_TESTS" ]
sources = deqp_gles2_sources deps = [ ":angle_deqp_gles2_common" ]
mustpass_dir = _aosp_mustpass mustpass_dir = _aosp_mustpass
} }
angle_deqp_core_gtest("gles3") { angle_deqp_core_gtest("gles3") {
defines = [ "ANGLE_DEQP_GLES3_TESTS" ] defines = [ "ANGLE_DEQP_GLES3_TESTS" ]
sources = deqp_gles3_sources deps = [ ":angle_deqp_gles3_common" ]
mustpass_dir = _aosp_mustpass mustpass_dir = _aosp_mustpass
} }
angle_deqp_core_gtest("gles31") { angle_deqp_core_gtest("gles31") {
defines = [ "ANGLE_DEQP_GLES31_TESTS" ] defines = [ "ANGLE_DEQP_GLES31_TESTS" ]
sources = deqp_gles31_sources deps = [ ":angle_deqp_gles31_common" ]
mustpass_dir = _aosp_mustpass mustpass_dir = _aosp_mustpass
} }
...@@ -1333,7 +1357,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -1333,7 +1357,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
mustpass_name = "${_api}-${mustpass_suffix}.txt" mustpass_name = "${_api}-${mustpass_suffix}.txt"
deps = angle_deqp_data_copy_targets deps += angle_deqp_data_copy_targets
data = [] data = []
if (_api == "gles3") { if (_api == "gles3") {
...@@ -1348,42 +1372,42 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -1348,42 +1372,42 @@ if (build_angle_deqp_tests && !is_fuchsia) {
angle_deqp_rotate_gtest("gles3_rotate90") { angle_deqp_rotate_gtest("gles3_rotate90") {
defines = [ "ANGLE_DEQP_GLES3_ROTATE90_TESTS" ] defines = [ "ANGLE_DEQP_GLES3_ROTATE90_TESTS" ]
sources = deqp_gles3_sources deps = [ ":angle_deqp_gles3_common" ]
mustpass_dir = _aosp_mustpass mustpass_dir = _aosp_mustpass
expectations_file = "deqp_gles3_rotate_test_expectations.txt" expectations_file = "deqp_gles3_rotate_test_expectations.txt"
} }
angle_deqp_rotate_gtest("gles3_rotate180") { angle_deqp_rotate_gtest("gles3_rotate180") {
defines = [ "ANGLE_DEQP_GLES3_ROTATE180_TESTS" ] defines = [ "ANGLE_DEQP_GLES3_ROTATE180_TESTS" ]
sources = deqp_gles3_sources deps = [ ":angle_deqp_gles3_common" ]
mustpass_dir = _aosp_mustpass mustpass_dir = _aosp_mustpass
expectations_file = "deqp_gles3_rotate_test_expectations.txt" expectations_file = "deqp_gles3_rotate_test_expectations.txt"
} }
angle_deqp_rotate_gtest("gles3_rotate270") { angle_deqp_rotate_gtest("gles3_rotate270") {
defines = [ "ANGLE_DEQP_GLES3_ROTATE270_TESTS" ] defines = [ "ANGLE_DEQP_GLES3_ROTATE270_TESTS" ]
sources = deqp_gles3_sources deps = [ ":angle_deqp_gles3_common" ]
mustpass_dir = _aosp_mustpass mustpass_dir = _aosp_mustpass
expectations_file = "deqp_gles3_rotate_test_expectations.txt" expectations_file = "deqp_gles3_rotate_test_expectations.txt"
} }
angle_deqp_rotate_gtest("gles31_rotate90") { angle_deqp_rotate_gtest("gles31_rotate90") {
defines = [ "ANGLE_DEQP_GLES31_ROTATE90_TESTS" ] defines = [ "ANGLE_DEQP_GLES31_ROTATE90_TESTS" ]
sources = deqp_gles31_sources deps = [ ":angle_deqp_gles31_common" ]
mustpass_dir = _aosp_mustpass mustpass_dir = _aosp_mustpass
expectations_file = "deqp_gles31_rotate_test_expectations.txt" expectations_file = "deqp_gles31_rotate_test_expectations.txt"
} }
angle_deqp_rotate_gtest("gles31_rotate180") { angle_deqp_rotate_gtest("gles31_rotate180") {
defines = [ "ANGLE_DEQP_GLES31_ROTATE180_TESTS" ] defines = [ "ANGLE_DEQP_GLES31_ROTATE180_TESTS" ]
sources = deqp_gles31_sources deps = [ ":angle_deqp_gles31_common" ]
mustpass_dir = _aosp_mustpass mustpass_dir = _aosp_mustpass
expectations_file = "deqp_gles31_rotate_test_expectations.txt" expectations_file = "deqp_gles31_rotate_test_expectations.txt"
} }
angle_deqp_rotate_gtest("gles31_rotate270") { angle_deqp_rotate_gtest("gles31_rotate270") {
defines = [ "ANGLE_DEQP_GLES31_ROTATE270_TESTS" ] defines = [ "ANGLE_DEQP_GLES31_ROTATE270_TESTS" ]
sources = deqp_gles31_sources deps = [ ":angle_deqp_gles31_common" ]
mustpass_dir = _aosp_mustpass mustpass_dir = _aosp_mustpass
expectations_file = "deqp_gles31_rotate_test_expectations.txt" expectations_file = "deqp_gles31_rotate_test_expectations.txt"
} }
......
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