Vulkan: Remove support for Stadia

Bug: angleproject:42262714
Change-Id: Icae5fe828fe4e0bcd287d297df1bc586708ef86e
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6344390
Commit-Queue: Shahbaz Youssefi <[email protected]>
Reviewed-by: Yuly Novikov <[email protected]>

Author: ShabbyX

BUILD.gn

@@ -243,10 +243,6 @@ config("internal_config") {
     defines += [ "ANGLE_PLATFORM_CHROMEOS" ]
   }
 
-  if (is_ggp) {
-    defines += [ "__ggp__" ]
-  }
-
   if (angle_use_vulkan_null_display) {
     defines += [ "ANGLE_USE_VULKAN_NULL_DISPLAY" ]
   } else if (angle_use_vulkan_display) {

README.md

@@ -32,7 +32,6 @@ ES 3.0 with [known issues][ES1].
 | iOS          |                |                |               |             |             | complete [2]         |
 | Chrome OS    |                |                |               |   complete  |   planned   |                      |
 | Android      |                |                |               |   complete  |   complete  |                      |
-| GGP (Stadia) |                |                |               |             |   complete  |                      |
 | Fuchsia      |                |                |               |             |   complete  |                      |
 
 [1] Metal is supported on macOS 10.14+

extensions/EGL_ANGLE_ggp_stream_descriptor.txt

@@ -5,8 +5,6 @@
 import("//build_overrides/angle.gni")
 
 declare_args() {
-  is_ggp = false
-
   # Extract native libs in ANGLE apk. Useful for flamegraph generation.
   angle_extract_native_libs = false
 
@@ -70,10 +68,9 @@ if (angle_has_build) {
 
   declare_args() {
     angle_use_gbm = ozone_platform_gbm
-    angle_use_x11 = ozone_platform_x11 && !is_ggp && (is_linux || is_chromeos)
-    angle_use_wayland =
-        ozone_platform_wayland && !is_ggp && is_linux && !is_castos
-    angle_use_vulkan_display = (is_linux || is_chromeos) && !is_ggp
+    angle_use_x11 = ozone_platform_x11 && (is_linux || is_chromeos)
+    angle_use_wayland = ozone_platform_wayland && is_linux && !is_castos
+    angle_use_vulkan_display = is_linux || is_chromeos
   }
 } else {
   declare_args() {
@@ -83,8 +80,8 @@ if (angle_has_build) {
     is_lsan = false
     build_with_chromium = false
     dcheck_always_on = false
-    angle_use_x11 = (is_linux || is_chromeos) && !is_ggp
-    angle_use_wayland = is_linux && !is_ggp
+    angle_use_x11 = is_linux || is_chromeos
+    angle_use_wayland = is_linux
     use_ozone = false
     ozone_platform_gbm = false
     ozone_platform_wayland = false
@@ -95,7 +92,7 @@ if (angle_has_build) {
   }
 
   declare_args() {
-    angle_use_vulkan_display = (is_linux || is_chromeos) && !is_ggp
+    angle_use_vulkan_display = is_linux || is_chromeos
   }
 }
 
@@ -186,14 +183,14 @@ declare_args() {
   angle_enable_gl =
       (ozone_platform_gbm || ozone_platform_wayland || !is_linux ||
        ((angle_use_x11 && !is_chromeos) || angle_use_wayland || is_castos)) &&
-      !is_fuchsia && !angle_is_winuwp && !is_ggp && !is_win_arm64 && !is_ios
+      !is_fuchsia && !angle_is_winuwp && !is_win_arm64 && !is_ios
 
   angle_enable_vulkan =
       angle_has_build &&
       ((is_win && !angle_is_winuwp) ||
        ((is_linux || is_chromeos) &&
         (angle_use_x11 || angle_use_wayland || angle_use_vulkan_display)) ||
-       is_android || is_fuchsia || is_ggp || is_mac)
+       is_android || is_fuchsia || is_mac)
 
   # When set to true, ANGLE will not use VK_KHR_surface and VK_KHR_swapchain
   # extensions. Content can be rendered only off-screen.
@@ -246,8 +243,7 @@ if (!defined(checkout_angle_mesa)) {
 declare_args() {
   # Currently SwiftShader's Vulkan front-end doesn't build on Android.
   # Disabled by default on MSVC because of compiler warnings/errors.
-  angle_enable_swiftshader =
-      angle_enable_vulkan && !is_android && !is_ggp && is_clang
+  angle_enable_swiftshader = angle_enable_vulkan && !is_android && is_clang
 
   # Translator backend support:
   angle_enable_hlsl = angle_enable_d3d9 || angle_enable_d3d11

extensions/EGL_ANGLE_swap_with_frame_token.txt

@@ -346,20 +346,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribANGLE(EGLDisplay dpy, EGLint
 #define EGL_CGL_PIXEL_FORMAT_ANGLE 0x3486
 #endif
 
-#ifndef EGL_ANGLE_ggp_stream_descriptor
-#define EGL_ANGLE_ggp_stream_descriptor 1
-#define EGL_GGP_STREAM_DESCRIPTOR_ANGLE 0x348B
-#endif /* EGL_ANGLE_ggp_stream_descriptor */
-
-#ifndef EGL_ANGLE_swap_with_frame_token
-#define EGL_ANGLE_swap_with_frame_token 1
-typedef khronos_uint64_t EGLFrameTokenANGLE;
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHFRAMETOKENANGLEPROC)(EGLDisplay dpy, EGLSurface surface, EGLFrameTokenANGLE frametoken);
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithFrameTokenANGLE(EGLDisplay dpy, EGLSurface surface, EGLFrameTokenANGLE frametoken);
-#endif
-#endif /* EGL_ANGLE_swap_with_frame_token */
-
 #ifndef EGL_ANGLE_prepare_swap_buffers
 #define EGL_ANGLE_prepare_swap_buffers 1
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLPREPARESWAPBUFFERSANGLEPROC)(EGLDisplay dpy, EGLSurface surface);

gni/angle.gni

@@ -98,12 +98,6 @@ struct FeaturesVk : FeatureSetBase
         &members,
     };
 
-    FeatureInfo supportsGGPFrameToken = {
-        "supportsGGPFrameToken",
-        FeatureCategory::VulkanFeatures,
-        &members,
-    };
-
     FeatureInfo supportsExternalMemoryFd = {
         "supportsExternalMemoryFd",
         FeatureCategory::VulkanFeatures,

include/EGL/eglext_angle.h

@@ -103,13 +103,6 @@
                 "VkDevice supports the VK_ANDROID_external_memory_android_hardware_buffer extension"
             ]
         },
-        {
-            "name": "supports_GGP_frame_token",
-            "category": "Features",
-            "description": [
-                "VkDevice supports the VK_GGP_frame_token extension"
-            ]
-        },
         {
             "name": "supports_external_memory_fd",
             "category": "Features",

include/platform/autogen/FeaturesVk_autogen.h

@@ -2,7 +2,7 @@
   "doc/ExtensionSupport.md":
     "9fedcc1a67af79d93c2da1105c9bada6",
   "scripts/egl_angle_ext.xml":
-    "d9434b5d3dc4842f02bbb06f54fb7e02",
+    "8389749098fae1d5c832a06b5be51dc1",
   "scripts/extension_data/intel_630_linux.json":
     "3b86832de6a7095f4617e273cba6d45e",
   "scripts/extension_data/intel_630_win10.json":
@@ -22,7 +22,7 @@
   "scripts/gl_angle_ext.xml":
     "ef111314bcf6e8c9cdc1a391080f1d80",
   "scripts/registry_xml.py":
-    "b4b40cf6f60ec0b2e8ef27dae59cfd91",
+    "d3c156a97242e0512175c43404d44570",
   "src/libANGLE/gen_extensions.py":
     "6ea1cb1733c4df98b527bbf2752e118b",
   "src/libANGLE/gles_extensions_autogen.cpp":

include/platform/vk_features.json

@@ -1,16 +1,16 @@
 {
   "scripts/egl_angle_ext.xml":
-    "d9434b5d3dc4842f02bbb06f54fb7e02",
+    "8389749098fae1d5c832a06b5be51dc1",
   "scripts/generate_loader.py":
     "93c78a8d11323fa311fed5118fbcf083",
   "scripts/gl_angle_ext.xml":
     "ef111314bcf6e8c9cdc1a391080f1d80",
   "scripts/registry_xml.py":
-    "b4b40cf6f60ec0b2e8ef27dae59cfd91",
+    "d3c156a97242e0512175c43404d44570",
   "src/libEGL/egl_loader_autogen.cpp":
-    "ab0ad32d623096b4a166c7bf5bf2561c",
+    "2aca2a57c51fc2b1c7e1da0a7ccf6107",
   "src/libEGL/egl_loader_autogen.h":
-    "a654f2dbdd5b1b343a478f8ecaf84fc5",
+    "bde0152d45cd681ab4e416a362a391d8",
   "third_party/EGL-Registry/src/api/egl.xml":
     "2056d54ea07156f1988ca1366bdee21a",
   "third_party/OpenCL-Docs/src/xml/cl.xml":
@@ -22,23 +22,23 @@
   "third_party/OpenGL-Registry/src/xml/wgl.xml":
     "eae784bf4d1b983a42af5671b140b7c4",
   "util/capture/trace_egl_loader_autogen.cpp":
-    "ea51900ee6b290c8a6ef1674ccc17224",
+    "a05c41eb1cc6e24c006cb3f462b694cf",
   "util/capture/trace_egl_loader_autogen.h":
-    "446416d576c66d5d9f0a709d27463879",
+    "9adc81af729078b16b36647f02401342",
   "util/capture/trace_gles_loader_autogen.cpp":
     "a1f5589204c04a128bec7cc37c09e618",
   "util/capture/trace_gles_loader_autogen.h":
-    "d6b1848250c6a21c592491cc2f365f58",
+    "7d3406626d8f43310056cdc6eeab677d",
   "util/egl_loader_autogen.cpp":
-    "1a25333935b4ead43a58ccdbffc7f253",
+    "ae6abfc6c2c0a997ad59258dfc0339ce",
   "util/egl_loader_autogen.h":
-    "8ab5beca6edba8c395561bb0af452029",
+    "ea5f73048616a6fc80eaa7e93ef5f0ce",
   "util/gles_loader_autogen.cpp":
     "21ba5e7139e81e9be425c5cacd0bb6b3",
   "util/gles_loader_autogen.h":
-    "01b1448da6ebd2bdd16e2bea5de9f273",
+    "b6aa8de9442b0dea722fdb71813cd31f",
   "util/windows/wgl_loader_autogen.cpp":
     "373b062587eab8a163121255f54597dc",
   "util/windows/wgl_loader_autogen.h":
-    "788190d21890b3ded845acb5ccbfb7ad"
+    "0551e9c28a8d3902bcd5d6e5b1ed3c6f"
 }