Generate executables for prerotation deqp tests

infra/gn_isolate_map.pyl

@@ -61,6 +61,36 @@
     "script": "//scripts/run_gtest_angle_test.py",
     "type": "script",
   },
+  "angle_deqp_gles3_rotate180_tests": {
+    "label": "//src/tests:angle_deqp_gles3_rotate180_tests",
+    "script": "//scripts/run_gtest_angle_test.py",
+    "type": "script",
+  },
+  "angle_deqp_gles3_rotate270_tests": {
+    "label": "//src/tests:angle_deqp_gles3_rotate270_tests",
+    "script": "//scripts/run_gtest_angle_test.py",
+    "type": "script",
+  },
+  "angle_deqp_gles3_rotate90_tests": {
+    "label": "//src/tests:angle_deqp_gles3_rotate90_tests",
+    "script": "//scripts/run_gtest_angle_test.py",
+    "type": "script",
+  },
+  "angle_deqp_gles31_rotate180_tests": {
+    "label": "//src/tests:angle_deqp_gles31_rotate180_tests",
+    "script": "//scripts/run_gtest_angle_test.py",
+    "type": "script",
+  },
+  "angle_deqp_gles31_rotate270_tests": {
+    "label": "//src/tests:angle_deqp_gles31_rotate270_tests",
+    "script": "//scripts/run_gtest_angle_test.py",
+    "type": "script",
+  },
+  "angle_deqp_gles31_rotate90_tests": {
+    "label": "//src/tests:angle_deqp_gles31_rotate90_tests",
+    "script": "//scripts/run_gtest_angle_test.py",
+    "type": "script",
+  },
   "angle_end2end_tests": {
     "label": "//src/tests:angle_end2end_tests",
     "script": "//scripts/run_gtest_angle_test.py",

src/tests/BUILD.gn

@@ -1310,6 +1310,74 @@ if (build_angle_deqp_tests && !is_fuchsia) {
     defines = [ "ANGLE_DEQP_KHR_GLES31_TESTS" ]
     mustpass_name = "gles31-khr-master.txt"
   }
+
+  template("angle_deqp_rotate_gtest") {
+    split_target = string_split(target_name, "_")
+    _api = split_target[0]
+    _rotate = split_target[1]
+    angle_deqp_gtest(target_name) {
+      forward_variables_from(invoker, "*")
+
+      if (_rotate == "rotate90") {
+        mustpass_suffix = "rotate-landscape"
+      } else if (_rotate == "rotate180") {
+        mustpass_suffix = "rotate-reverse-portrait"
+      } else if (_rotate == "rotate270") {
+        mustpass_suffix = "rotate-reverse-landscape"
+      } else {
+        assert(false)
+      }
+
+      mustpass_name = "${_api}-${mustpass_suffix}.txt"
+
+      deps = angle_deqp_data_copy_targets
+
+      data = []
+      if (_api == "gles3") {
+        data = angle_deqp_data_gles3
+      } else if (_api == "gles31") {
+        data = angle_deqp_data_gles31
+      } else {
+        assert(false)
+      }
+    }
+  }
+
+  angle_deqp_rotate_gtest("gles3_rotate90") {
+    defines = [ "ANGLE_DEQP_GLES3_ROTATE90_TESTS" ]
+    sources = deqp_gles3_sources
+    mustpass_dir = _aosp_mustpass
+  }
+
+  angle_deqp_rotate_gtest("gles3_rotate180") {
+    defines = [ "ANGLE_DEQP_GLES3_ROTATE180_TESTS" ]
+    sources = deqp_gles3_sources
+    mustpass_dir = _aosp_mustpass
+  }
+
+  angle_deqp_rotate_gtest("gles3_rotate270") {
+    defines = [ "ANGLE_DEQP_GLES3_ROTATE270_TESTS" ]
+    sources = deqp_gles3_sources
+    mustpass_dir = _aosp_mustpass
+  }
+
+  angle_deqp_rotate_gtest("gles31_rotate90") {
+    defines = [ "ANGLE_DEQP_GLES31_ROTATE90_TESTS" ]
+    sources = deqp_gles31_sources
+    mustpass_dir = _aosp_mustpass
+  }
+
+  angle_deqp_rotate_gtest("gles31_rotate180") {
+    defines = [ "ANGLE_DEQP_GLES31_ROTATE180_TESTS" ]
+    sources = deqp_gles31_sources
+    mustpass_dir = _aosp_mustpass
+  }
+
+  angle_deqp_rotate_gtest("gles31_rotate270") {
+    defines = [ "ANGLE_DEQP_GLES31_ROTATE270_TESTS" ]
+    sources = deqp_gles31_sources
+    mustpass_dir = _aosp_mustpass
+  }
 }
 
 group("angle_tests") {

src/tests/deqp_support/angle_deqp_gtest.cpp

@@ -69,21 +69,32 @@ const char *gTestExpectationsSearchPaths[] = {
 
 #define OPENGL_CTS_DIR(PATH) "/external/openglcts/data/mustpass/gles/" PATH
 
-const char *gCaseListFiles[] = {OPENGL_CTS_DIR("aosp_mustpass/master/gles2-master.txt"),
-                                OPENGL_CTS_DIR("aosp_mustpass/master/gles3-master.txt"),
-                                OPENGL_CTS_DIR("aosp_mustpass/master/gles31-master.txt"),
-                                "/android/cts/master/egl-master.txt",
-                                OPENGL_CTS_DIR("khronos_mustpass/master/gles2-khr-master.txt"),
-                                OPENGL_CTS_DIR("khronos_mustpass/master/gles3-khr-master.txt"),
-                                OPENGL_CTS_DIR("khronos_mustpass/master/gles31-khr-master.txt")};
+const char *gCaseListFiles[] = {
+    OPENGL_CTS_DIR("aosp_mustpass/master/gles2-master.txt"),
+    OPENGL_CTS_DIR("aosp_mustpass/master/gles3-master.txt"),
+    OPENGL_CTS_DIR("aosp_mustpass/master/gles31-master.txt"),
+    "/android/cts/master/egl-master.txt",
+    OPENGL_CTS_DIR("khronos_mustpass/master/gles2-khr-master.txt"),
+    OPENGL_CTS_DIR("khronos_mustpass/master/gles3-khr-master.txt"),
+    OPENGL_CTS_DIR("khronos_mustpass/master/gles31-khr-master.txt"),
+    OPENGL_CTS_DIR("aosp_mustpass/master/gles3-rotate-landscape.txt"),
+    OPENGL_CTS_DIR("aosp_mustpass/master/gles3-rotate-reverse-portrait.txt"),
+    OPENGL_CTS_DIR("aosp_mustpass/master/gles3-rotate-reverse-landscape.txt"),
+    OPENGL_CTS_DIR("aosp_mustpass/master/gles31-rotate-landscape.txt"),
+    OPENGL_CTS_DIR("aosp_mustpass/master/gles31-rotate-reverse-portrait.txt"),
+    OPENGL_CTS_DIR("aosp_mustpass/master/gles31-rotate-reverse-landscape.txt"),
+};
 
 #undef OPENGL_CTS_DIR
 
 const char *gTestExpectationsFiles[] = {
-    "deqp_gles2_test_expectations.txt",      "deqp_gles3_test_expectations.txt",
-    "deqp_gles31_test_expectations.txt",     "deqp_egl_test_expectations.txt",
-    "deqp_khr_gles2_test_expectations.txt",  "deqp_khr_gles3_test_expectations.txt",
-    "deqp_khr_gles31_test_expectations.txt",
+    "deqp_gles2_test_expectations.txt",         "deqp_gles3_test_expectations.txt",
+    "deqp_gles31_test_expectations.txt",        "deqp_egl_test_expectations.txt",
+    "deqp_khr_gles2_test_expectations.txt",     "deqp_khr_gles3_test_expectations.txt",
+    "deqp_khr_gles31_test_expectations.txt",    "deqp_gles3_rotate_test_expectations.txt",
+    "deqp_gles3_rotate_test_expectations.txt",  "deqp_gles3_rotate_test_expectations.txt",
+    "deqp_gles31_rotate_test_expectations.txt", "deqp_gles31_rotate_test_expectations.txt",
+    "deqp_gles31_rotate_test_expectations.txt",
 };
 
 using APIInfo = std::pair<const char *, GPUTestConfig::API>;
@@ -596,6 +607,30 @@ ANGLE_INSTANTIATE_DEQP_TEST_CASE(KHR_GLES3, 5);
 ANGLE_INSTANTIATE_DEQP_TEST_CASE(KHR_GLES31, 6);
 #endif
 
+#ifdef ANGLE_DEQP_GLES3_ROTATE90_TESTS
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES3_ROTATE90, 7);
+#endif
+
+#ifdef ANGLE_DEQP_GLES3_ROTATE180_TESTS
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES3_ROTATE180, 8);
+#endif
+
+#ifdef ANGLE_DEQP_GLES3_ROTATE270_TESTS
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES3_ROTATE270, 9);
+#endif
+
+#ifdef ANGLE_DEQP_GLES31_ROTATE90_TESTS
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES31_ROTATE90, 10);
+#endif
+
+#ifdef ANGLE_DEQP_GLES31_ROTATE180_TESTS
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES31_ROTATE180, 11);
+#endif
+
+#ifdef ANGLE_DEQP_GLES31_ROTATE270_TESTS
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES31_ROTATE270, 12);
+#endif
+
 void HandleDisplayType(const char *displayTypeString)
 {
     std::stringstream argStream;

src/tests/deqp_support/deqp_gles31_rotate_test_expectations.txt

+// 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.
+
+// See README.md for format.
+
+// Only tested on Vulkan currently
+
+// Conflict between "interpolateAtOffset()" and the viewport transformation for a default framebuffer
+3589 VULKAN : dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_offset.no_qualifiers.default_framebuffer = FAIL
+3589 VULKAN : dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_offset.centroid_qualifier.default_framebuffer = FAIL
+3589 VULKAN : dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_offset.sample_qualifier.default_framebuffer = FAIL
+3589 VULKAN : dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_offset.array_element.default_framebuffer = FAIL

src/tests/deqp_support/deqp_gles3_rotate_test_expectations.txt

+// 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.
+
+// See README.md for format.
+
+// Only tested on Vulkan currently
+
+// Flat shading:
+3430 VULKAN : dEQP-GLES3.functional.rasterization.flatshading.* = FAIL
+
+// Android Vulkan failures
+2830 ANDROID VULKAN : dEQP-GLES3.functional.rasterization.fbo.rbo_singlesample.primitives.lines = FAIL
+2830 ANDROID VULKAN : dEQP-GLES3.functional.rasterization.fbo.texture_2d.primitives.lines = FAIL
+2830 ANDROID VULKAN : dEQP-GLES3.functional.rasterization.primitives.line* = FAIL
+2808 ANDROID VULKAN : dEQP-GLES3.functional.shaders.builtin_variable.fragcoord_w = FAIL
+
+161540999 PIXEL2ORXL VULKAN : dEQP-GLES3.functional.color_clear.masked_rgb = FAIL
+161540999 PIXEL2ORXL VULKAN : dEQP-GLES3.functional.color_clear.masked_rgba = FAIL
+161540999 PIXEL2ORXL VULKAN : dEQP-GLES3.functional.depth_stencil_clear.depth_stencil_masked = FAIL
+
+// Fixed in later driver versions.
+2727 VULKAN ANDROID : dEQP-GLES3.functional.shaders.builtin_variable.pointcoord = FAIL