Merge remote-tracking branch 'origin/upstream/sdk-1.2.198' into HEAD

This merges Vulkan-Tools (vulkaninfo, cube) upstream 1.2.198
version to Fuchsia repository.

Bug: 90846
Change-Id: Idec2239e8e7012907380186d745a131aa058162a
diff --git a/BUILD.gn b/BUILD.gn
index a6b6552..14b8e27 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -13,12 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build_overrides/build.gni")
 import("//build_overrides/vulkan_tools.gni")
 
-# Vulkan-tools isn't ported to Fuchsia yet.
-# TODO(spang): Port mock ICD to Fuchsia.
-assert(!is_fuchsia)
-
 vulkan_undefine_configs = []
 if (is_win) {
   vulkan_undefine_configs += [
@@ -61,8 +58,10 @@
     if (is_win) {
       sources += [ "icd/VkICD_mock_icd.def" ]
     }
-    configs -= [ "//build/config/compiler:chromium_code" ]
-    configs += [ "//build/config/compiler:no_chromium_code" ]
+    if (build_with_chromium) {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+    }
   }
 
   action("vulkan_gen_icd_json_file") {
@@ -78,6 +77,10 @@
       sources += [ "icd/linux/VkICD_mock_icd.json" ]
       args += [ "$raw_vulkan_icd_dir/linux" ]
     }
+    if (is_fuchsia) {
+      sources += [ "icd/linux/VkICD_mock_icd.json" ]
+      args += [ "$raw_vulkan_icd_dir/fuchsia" ]
+    }
     if (is_mac) {
       sources += [ "icd/macos/VkICD_mock_icd.json" ]
       args += [ "$raw_vulkan_icd_dir/macos" ]
@@ -88,4 +91,30 @@
     data = outputs
     args += [ raw_vulkan_data_dir ] + rebase_path(sources, root_build_dir)
   }
+
+  config("vulkaninfo_warnings") {
+    cflags = [
+      "-Wno-conversion",
+      "-Wno-implicit-fallthrough",
+      "-Wno-missing-field-initializers",
+      "-Wno-extra-semi",
+    ]
+  }
+
+  executable("vulkaninfo") {
+    sources = [ "vulkaninfo/vulkaninfo.cpp" ]
+
+    include_dirs = [
+      "vulkaninfo/generated",
+      "vulkaninfo",
+    ]
+
+    deps = [
+      "$vulkan_headers_dir:vulkan_headers",
+      "//third_party/Vulkan-Loader:libvulkan",
+    ]
+
+    configs += [ ":vulkaninfo_warnings" ]
+    configs -= [ "//build/config:no_exceptions" ]
+  }
 }
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..8089867
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,4 @@
+reveman@google.com
+jbauman@google.com
+rosasco@google.com
+cstout@google.com
diff --git a/README.fuchsia b/README.fuchsia
new file mode 100644
index 0000000..bb4f0be
--- /dev/null
+++ b/README.fuchsia
@@ -0,0 +1,8 @@
+Name: Vulkan-Tools
+License: Apache 2.0
+License File: LICENSE.txt
+Upstream Git: https://github.com/KhronosGroup/Vulkan-Tools
+Description:
+
+Provides Khronos official Vulkan Tools and Utilities.
+
diff --git a/cube/BUILD.gn b/cube/BUILD.gn
new file mode 100644
index 0000000..fa8e6ca
--- /dev/null
+++ b/cube/BUILD.gn
@@ -0,0 +1,245 @@
+# Copyright (C) 2020 The Fuchsia Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/compiled_action.gni")
+import("//build/components/fuchsia_package_with_single_component.gni")
+import("//build_overrides/vulkan_tools.gni")
+import("//src/lib/vulkan/layers.gni")
+import("//src/sys/component_index/component_index.gni")
+
+group("cube") {
+  testonly = true
+  deps = [
+    ":vkcube-on-fb",
+    ":vkcube-on-scenic",
+    ":vkcube-skip-present",
+  ]
+}
+
+add_to_component_index("fb-component-index") {
+  package_name = "vkcube-on-fb"
+  manifest = "meta/vkcube-on-fb.cmx"
+}
+
+fuchsia_package_with_single_component("vkcube-on-fb") {
+  testonly = true
+
+  deps = [
+    ":cube-fb",
+    ":fb-component-index",
+    "//src/lib/vulkan/swapchain:image_pipe_swapchain_fb_layer",
+    "//src/lib/vulkan/validation_layers",
+  ]
+
+  component_name = "vkcube-on-fb"
+  manifest = "fuchsia/meta/vkcube-on-fb.cmx"
+}
+
+add_to_component_index("scenic-component-index") {
+  package_name = "vkcube-on-scenic"
+  manifest = "meta/vkcube-on-scenic.cmx"
+}
+
+fuchsia_package_with_single_component("vkcube-on-scenic") {
+  testonly = true
+
+  deps = [
+    ":cube-scenic",
+    ":scenic-component-index",
+    "//src/lib/vulkan/swapchain:image_pipe_swapchain_layer",
+    "//src/lib/vulkan/validation_layers",
+  ]
+
+  component_name = "vkcube-on-scenic"
+  manifest = "fuchsia/meta/vkcube-on-scenic.cmx"
+}
+
+add_to_component_index("skip-present-component-index") {
+  package_name = "vkcube-skip-present"
+  manifest = "meta/vkcube-skip-present.cmx"
+}
+
+fuchsia_package_with_single_component("vkcube-skip-present") {
+  testonly = true
+
+  deps = [
+    ":cube-skip-present",
+    ":skip-present-component-index",
+    "//src/lib/vulkan/swapchain:image_pipe_swapchain_fb_skip_present_layer",
+    "//src/lib/vulkan/validation_layers",
+  ]
+
+  component_name = "vkcube-skip-present"
+  manifest = "fuchsia/meta/vkcube-skip-present.cmx"
+}
+
+config("cube_config") {
+  cube_frag_inc = "$target_gen_dir/cube.frag.inc"
+  cube_vert_inc = "$target_gen_dir/cube.vert.inc"
+
+  cube_frag_inc_rebased = rebase_path(cube_frag_inc, root_build_dir)
+  cube_vert_inc_rebased = rebase_path(cube_vert_inc, root_build_dir)
+
+  inputs = [
+    cube_frag_inc,
+    cube_vert_inc,
+  ]
+
+  defines = [
+    "CUBE_FRAG_INC=\"$cube_frag_inc_rebased\"",
+    "CUBE_VERT_INC=\"$cube_vert_inc_rebased\"",
+  ]
+
+  include_dirs = [ root_build_dir ]
+
+  cflags = [ "-Wno-implicit-int-float-conversion" ]
+}
+
+executable("cube-scenic") {
+  output_name = "vkcube-on-scenic"
+  defines = [
+    "FUCHSIA_USE_SCENIC=1",
+    "FUCHSIA_IMAGEPIPE_LAYER=\"VK_LAYER_FUCHSIA_imagepipe_swapchain\"",
+  ]
+
+  if (defined(texture_ppm_h)) {
+    path = rebase_path(texture_ppm_h, root_build_dir)
+    defines += [ "TEXTURE_PPM_H=\"$path\"" ]
+  }
+
+  sources = [
+    "cube.cpp",
+    "fuchsia/imagepipe_view.cpp",
+    "fuchsia/imagepipe_view.h",
+  ]
+
+  configs += [ ":cube_config" ]
+
+  deps = [
+    ":glslang_frag",
+    ":glslang_vert",
+    "//sdk/fidl/fuchsia.ui.app",
+    "//sdk/fidl/fuchsia.ui.gfx",
+    "//sdk/fidl/fuchsia.ui.scenic",
+    "//sdk/lib/sys/cpp",
+    "//sdk/lib/ui/scenic/cpp",
+    "//third_party/Vulkan-Loader:libvulkan",
+    "//zircon/system/ulib/async-loop:async-loop-cpp",
+    "//zircon/system/ulib/async-loop:async-loop-default",
+    "//zircon/system/ulib/syslog",
+  ]
+}
+
+executable("cube-fb") {
+  output_name = "vkcube-on-fb"
+  defines = [
+    "FUCHSIA_USE_SCENIC=0",
+    "FUCHSIA_IMAGEPIPE_LAYER=\"VK_LAYER_FUCHSIA_imagepipe_swapchain_fb\"",
+  ]
+
+  if (defined(texture_ppm_h)) {
+    path = rebase_path(texture_ppm_h, root_build_dir)
+    defines += [ "TEXTURE_PPM_H=\"$path\"" ]
+  }
+
+  sources = [ "cube.cpp" ]
+
+  configs += [ ":cube_config" ]
+
+  deps = [
+    ":glslang_frag",
+    ":glslang_vert",
+    "//third_party/Vulkan-Loader:libvulkan",
+  ]
+}
+
+executable("cube-skip-present") {
+  output_name = "vkcube-skip-present"
+  defines = [
+    "FUCHSIA_USE_SCENIC=0",
+    "FUCHSIA_IMAGEPIPE_LAYER=\"VK_LAYER_FUCHSIA_imagepipe_swapchain_fb_skip_present\"",
+  ]
+
+  if (defined(texture_ppm_h)) {
+    path = rebase_path(texture_ppm_h, root_build_dir)
+    defines += [ "TEXTURE_PPM_H=\"$path\"" ]
+  }
+
+  sources = [ "cube.cpp" ]
+
+  configs += [ ":cube_config" ]
+
+  deps = [
+    ":glslang_frag",
+    ":glslang_vert",
+    "//third_party/Vulkan-Loader:libvulkan",
+  ]
+}
+
+config("cube_wayland_config") {
+  cflags = [ "-Wno-missing-field-initializers" ]
+}
+
+executable("cube-wayland") {
+  defines = [ "USE_XDG_SHELL=1" ]
+
+  sources = [
+    "cube.cpp",
+    "xdg-shell-unstable-v6.c",
+  ]
+
+  configs += [
+    ":cube_config",
+    ":cube_wayland_config",
+  ]
+
+  deps = [
+    ":glslang_frag",
+    ":glslang_vert",
+    "//third_party/Vulkan-Loader:libvulkan",
+    "//third_party/wayland:client",
+  ]
+}
+
+compiled_action("glslang_frag") {
+  tool = "//third_party/glslang:glslang_validator"
+  outputs = [ "$target_gen_dir/cube.frag.inc" ]
+
+  sources = [ "cube.frag" ]
+
+  args = [
+    "--quiet",
+    "-V",
+    "-x",
+    "-o",
+    rebase_path("$target_gen_dir/cube.frag.inc", root_build_dir),
+    rebase_path("cube.frag", root_build_dir),
+  ]
+}
+
+compiled_action("glslang_vert") {
+  tool = "//third_party/glslang:glslang_validator"
+  outputs = [ "$target_gen_dir/cube.vert.inc" ]
+
+  sources = [ "cube.vert" ]
+
+  args = [
+    "--quiet",
+    "-V",
+    "-x",
+    "-o",
+    rebase_path("$target_gen_dir/cube.vert.inc", root_build_dir),
+    rebase_path("cube.vert", root_build_dir),
+  ]
+}
diff --git a/cube/cube.c b/cube/cube.c
index ae37be4..f1d4bea 100644
--- a/cube/cube.c
+++ b/cube/cube.c
@@ -3914,7 +3914,7 @@
 
     demo->connection = xcb_connect(NULL, &scr);
     if (xcb_connection_has_error(demo->connection) > 0) {
-        printf("Cannot find a compatible Vulkan installable client driver (ICD).\nExiting ...\n");
+        printf("Cannot connect to XCB.\nExiting ...\n");
         fflush(stdout);
         exit(1);
     }
@@ -3928,7 +3928,7 @@
     demo->display = wl_display_connect(NULL);
 
     if (demo->display == NULL) {
-        printf("Cannot find a compatible Vulkan installable client driver (ICD).\nExiting ...\n");
+        printf("Cannot connect to wayland.\nExiting ...\n");
         fflush(stdout);
         exit(1);
     }
diff --git a/cube/cube.cpp b/cube/cube.cpp
index cd983e0..d539ab6 100644
--- a/cube/cube.cpp
+++ b/cube/cube.cpp
@@ -2,6 +2,7 @@
  * Copyright (c) 2015-2019 The Khronos Group Inc.
  * Copyright (c) 2015-2019 Valve Corporation
  * Copyright (c) 2015-2019 LunarG, Inc.
+ * Copyright (c) 2020 The Fuchsia Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +23,18 @@
 #include <X11/Xutil.h>
 #elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
 #include <linux/input.h>
+#if defined(USE_XDG_SHELL)
+#include "xdg-shell-unstable-v6.h"
+#else
 #include "xdg-shell-client-header.h"
 #include "xdg-decoration-client-header.h"
 #endif
+#elif defined(VK_USE_PLATFORM_FUCHSIA) && FUCHSIA_USE_SCENIC
+#include <lib/async-loop/cpp/loop.h>
+#include <lib/async-loop/default.h>
+#include <lib/zx/channel.h>
+#include <src/lib/vulkan/imagepipe_view/imagepipe_view.h>  // nogncheck
+#endif
 
 #include <cassert>
 #include <cinttypes>
@@ -267,6 +277,10 @@
 #elif defined(VK_USE_PLATFORM_DISPLAY_KHR)
     vk::Result create_display_surface();
     void run_display();
+#elif defined(VK_USE_PLATFORM_FUCHSIA)
+    void create_imagepipe_view();
+    vk::Result create_imagepipe_surface();
+    void run();
 #endif
 
 #if defined(VK_USE_PLATFORM_WIN32_KHR)
@@ -288,12 +302,19 @@
     wl_registry *registry;
     wl_compositor *compositor;
     wl_surface *window;
+#if defined(USE_XDG_SHELL)
+    zxdg_shell_v6 *shell;
+    zxdg_surface_v6 *window_surface;
+    bool xdg_surface_has_been_configured;
+    zxdg_toplevel_v6 *window_toplevel;
+#else
     xdg_wm_base *wm_base;
     zxdg_decoration_manager_v1 *xdg_decoration_mgr;
     zxdg_toplevel_decoration_v1 *toplevel_decoration;
     xdg_surface *window_surface;
     bool xdg_surface_has_been_configured;
     xdg_toplevel *window_toplevel;
+#endif
     wl_seat *seat;
     wl_pointer *pointer;
     wl_keyboard *keyboard;
@@ -303,6 +324,12 @@
     IDirectFBEventBuffer *event_buffer;
 #elif defined(VK_USE_PLATFORM_METAL_EXT)
     void *caMetalLayer;
+#elif defined(VK_USE_PLATFORM_FUCHSIA) && FUCHSIA_USE_SCENIC
+    zx::channel image_pipe_handle;
+    async::Loop loop;
+    std::unique_ptr<sys::ComponentContext> context;
+    std::unique_ptr<ImagePipeViewProviderService> view_provider_service;
+    std::unique_ptr<ImagePipeView> imagepipe_view;
 #endif
 
     vk::SurfaceKHR surface;
@@ -311,6 +338,7 @@
     bool use_xlib;
     bool separate_present_queue;
     int32_t gpu_number;
+    bool protected_output;
 
     vk::Instance inst;
     vk::PhysicalDevice gpu;
@@ -405,6 +433,87 @@
 #endif
 
 #if defined(VK_USE_PLATFORM_WAYLAND_KHR)
+
+#if defined(USE_XDG_SHELL)
+static void handle_ping(void *data, zxdg_shell_v6 *shell, uint32_t serial) {
+    zxdg_shell_v6_pong(shell, serial);
+}
+
+static const zxdg_shell_v6_listener shell_listener = {handle_ping};
+
+static void handle_surface_configure(void *data, zxdg_surface_v6 *xdg_surface, uint32_t serial) {
+    Demo *demo = (Demo *)data;
+    zxdg_surface_v6_ack_configure(xdg_surface, serial);
+    if (demo->xdg_surface_has_been_configured) {
+        demo->resize();
+    }
+    demo->xdg_surface_has_been_configured = true;
+}
+
+static const zxdg_surface_v6_listener surface_listener = {handle_surface_configure};
+
+static void handle_toplevel_configure(void *data, zxdg_toplevel_v6 *xdg_toplevel, int32_t width, int32_t height,
+                                      struct wl_array *states) {
+    printf("handle_toplevel_configure width %d height %d\n", (int)width, (int)height);
+    Demo *demo = (Demo *)data;
+    demo->width = width;
+    demo->height = height;
+    // This will be followed by a surface configure
+}
+
+static void handle_toplevel_close(void *data, zxdg_toplevel_v6 *xdg_toplevel) {
+    Demo *demo = (Demo *)data;
+    demo->quit = true;
+}
+
+static const zxdg_toplevel_v6_listener toplevel_listener = {handle_toplevel_configure, handle_toplevel_close};
+
+#else
+
+static void handle_ping(void *data, wl_shell_surface *shell_surface, uint32_t serial) {
+    wl_shell_surface_pong(shell_surface, serial);
+}
+
+static void handle_configure(void *data, wl_shell_surface *shell_surface, uint32_t edges, int32_t width, int32_t height) {}
+
+static void handle_popup_done(void *data, wl_shell_surface *shell_surface) {}
+
+static const wl_shell_surface_listener shell_surface_listener = {handle_ping, handle_configure, handle_popup_done};
+
+static void handle_surface_configure(void *data, xdg_surface *xdg_surface, uint32_t serial) {
+    Demo *demo = (Demo *)data;
+    xdg_surface_ack_configure(xdg_surface, serial);
+    if (demo->xdg_surface_has_been_configured) {
+        demo->resize();
+    }
+    demo->xdg_surface_has_been_configured = true;
+}
+
+static const xdg_surface_listener surface_listener = {handle_surface_configure};
+
+static void handle_toplevel_configure(void *data, xdg_toplevel *xdg_toplevel, int32_t width, int32_t height,
+                                      struct wl_array *states) {
+    Demo *demo = (Demo *)data;
+    /* zero values imply the program may choose its own size, so in that case
+     * stay with the existing value (which on startup is the default) */
+    if (width > 0) {
+        demo->width = width;
+    }
+    if (height > 0) {
+        demo->height = height;
+    }
+    // This will be followed by a surface configure
+}
+
+static void handle_toplevel_close(void *data, xdg_toplevel *xdg_toplevel) {
+    Demo *demo = (Demo *)data;
+    demo->quit = true;
+}
+
+static const xdg_toplevel_listener toplevel_listener = {handle_toplevel_configure, handle_toplevel_close};
+
+#endif // USE_XDG_SHELL
+
 static void pointer_handle_enter(void *data, struct wl_pointer *pointer, uint32_t serial, struct wl_surface *surface, wl_fixed_t sx,
                                  wl_fixed_t sy) {}
 
@@ -416,14 +525,20 @@
                                   uint32_t state) {
     Demo *demo = (Demo *)data;
     if (button == BTN_LEFT && state == WL_POINTER_BUTTON_STATE_PRESSED) {
+#if defined(USE_XDG_SHELL)
+        zxdg_toplevel_v6_move(demo->window_toplevel, demo->seat, serial);
+#else
         xdg_toplevel_move(demo->window_toplevel, demo->seat, serial);
+#endif
     }
 }
 
 static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer, uint32_t time, uint32_t axis, wl_fixed_t value) {}
 
+static void pointer_handle_frame(void *data, struct wl_pointer *wl_pointer) {}
+
 static const struct wl_pointer_listener pointer_listener = {
-    pointer_handle_enter, pointer_handle_leave, pointer_handle_motion, pointer_handle_button, pointer_handle_axis,
+    pointer_handle_enter, pointer_handle_leave, pointer_handle_motion, pointer_handle_button, pointer_handle_axis, pointer_handle_frame,
 };
 
 static void keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard, uint32_t format, int fd, uint32_t size) {}
@@ -484,24 +599,35 @@
     seat_handle_capabilities,
 };
 
+#if !defined(USE_XDG_SHELL)
+
 static void wm_base_ping(void *data, xdg_wm_base *xdg_wm_base, uint32_t serial) { xdg_wm_base_pong(xdg_wm_base, serial); }
 
 static const struct xdg_wm_base_listener wm_base_listener = {wm_base_ping};
 
+#endif // !defined(USE_XDG_SHELL)
+
 static void registry_handle_global(void *data, wl_registry *registry, uint32_t id, const char *interface, uint32_t version) {
     Demo *demo = (Demo *)data;
     // pickup wayland objects when they appear
     if (strcmp(interface, wl_compositor_interface.name) == 0) {
         demo->compositor = (wl_compositor *)wl_registry_bind(registry, id, &wl_compositor_interface, 1);
+#if defined(USE_XDG_SHELL)
+    } else if (strcmp(interface, zxdg_shell_v6_interface.name) == 0) {
+        demo->shell = (zxdg_shell_v6 *)wl_registry_bind(registry, id, &zxdg_shell_v6_interface, version);
+#else
     } else if (strcmp(interface, xdg_wm_base_interface.name) == 0) {
         demo->wm_base = (xdg_wm_base *)wl_registry_bind(registry, id, &xdg_wm_base_interface, 1);
         xdg_wm_base_add_listener(demo->wm_base, &wm_base_listener, nullptr);
+#endif
     } else if (strcmp(interface, wl_seat_interface.name) == 0) {
         demo->seat = (wl_seat *)wl_registry_bind(registry, id, &wl_seat_interface, 1);
         wl_seat_add_listener(demo->seat, &seat_listener, demo);
+#if !defined(USE_XDG_SHELL)
     } else if (strcmp(interface, zxdg_decoration_manager_v1_interface.name) == 0) {
         demo->xdg_decoration_mgr =
             (zxdg_decoration_manager_v1 *)wl_registry_bind(registry, id, &zxdg_decoration_manager_v1_interface, 1);
+#endif
     }
 }
 
@@ -531,15 +657,23 @@
       registry{nullptr},
       compositor{nullptr},
       window{nullptr},
+#if defined(USE_XDG_SHELL)
+      window_surface{nullptr},
+      xdg_surface_has_been_configured{false},
+      window_toplevel{nullptr},
+#else
       wm_base{nullptr},
       xdg_decoration_mgr{nullptr},
       toplevel_decoration{nullptr},
       window_surface{nullptr},
       xdg_surface_has_been_configured{false},
       window_toplevel{nullptr},
+#endif
       seat{nullptr},
       pointer{nullptr},
       keyboard{nullptr},
+#elif defined(VK_USE_PLATFORM_FUCHSIA) && FUCHSIA_USE_SCENIC
+      loop(&kAsyncLoopConfigAttachToCurrentThread),
 #elif defined(VK_USE_PLATFORM_DIRECTFB_EXT)
       dfb{nullptr},
       window{nullptr},
@@ -684,14 +818,23 @@
     wl_keyboard_destroy(keyboard);
     wl_pointer_destroy(pointer);
     wl_seat_destroy(seat);
+#if defined(USE_XDG_SHELL)
+    zxdg_toplevel_v6_destroy(window_toplevel);
+    zxdg_surface_v6_destroy(window_surface);
+#else
     xdg_toplevel_destroy(window_toplevel);
     xdg_surface_destroy(window_surface);
+#endif
     wl_surface_destroy(window);
+#if defined(USE_XDG_SHELL)
+    zxdg_shell_v6_destroy(shell);
+#else
     xdg_wm_base_destroy(wm_base);
     if (xdg_decoration_mgr) {
         zxdg_toplevel_decoration_v1_destroy(toplevel_decoration);
         zxdg_decoration_manager_v1_destroy(xdg_decoration_mgr);
     }
+#endif
     wl_compositor_destroy(compositor);
     wl_registry_destroy(registry);
     wl_display_disconnect(display);
@@ -711,8 +854,14 @@
     queues[0].setQueueFamilyIndex(graphics_queue_family_index);
     queues[0].setQueueCount(1);
     queues[0].setPQueuePriorities(priorities);
+    if (protected_output) {
+        queues[0].setFlags(vk::DeviceQueueCreateFlagBits::eProtected);
+    }
+
+    auto const protected_memory = vk::PhysicalDeviceProtectedMemoryFeatures().setProtectedMemory(protected_output);
 
     auto deviceInfo = vk::DeviceCreateInfo()
+                          .setPNext(&protected_memory)
                           .setQueueCreateInfoCount(1)
                           .setPQueueCreateInfos(queues)
                           .setEnabledLayerCount(0)
@@ -772,7 +921,9 @@
     // engine has fully released ownership to the application, and it is
     // okay to render to the image.
     vk::PipelineStageFlags const pipe_stage_flags = vk::PipelineStageFlagBits::eColorAttachmentOutput;
+    auto const protected_submit_info = vk::ProtectedSubmitInfo().setProtectedSubmit(protected_output);
     auto const submit_info = vk::SubmitInfo()
+                                 .setPNext(&protected_submit_info)
                                  .setPWaitDstStageMask(&pipe_stage_flags)
                                  .setWaitSemaphoreCount(1)
                                  .setPWaitSemaphores(&image_acquired_semaphores[frame_index])
@@ -929,7 +1080,9 @@
     VERIFY(result == vk::Result::eSuccess);
 
     vk::CommandBuffer const commandBuffers[] = {cmd};
-    auto const submitInfo = vk::SubmitInfo().setCommandBufferCount(1).setPCommandBuffers(commandBuffers);
+    auto const protected_submit_info = vk::ProtectedSubmitInfo().setProtectedSubmit(protected_output);
+    auto const submitInfo =
+        vk::SubmitInfo().setCommandBufferCount(1).setPCommandBuffers(commandBuffers).setPNext(&protected_submit_info);
 
     result = graphics_queue.submit(1, &submitInfo, fence);
     VERIFY(result == vk::Result::eSuccess);
@@ -953,8 +1106,9 @@
     width = 500;
     height = 500;
     use_xlib = false;
-    /* Autodetect suitable / best GPU by default */
-    gpu_number = -1;
+    /* For cube demo we just grab the first physical device by default */
+    gpu_number = 0;
+    protected_output = false;
 
     for (int i = 1; i < argc; i++) {
         if (strcmp(argv[i], "--use_staging") == 0) {
@@ -1001,11 +1155,17 @@
             i++;
             continue;
         }
+        if (strcmp(argv[i], "--protected_output") == 0) {
+            protected_output = true;
+            continue;
+        }
+
         std::stringstream usage;
         usage << "Usage:\n  " << APP_SHORT_NAME << "\t[--use_staging] [--validate]\n"
               << "\t[--break] [--c <framecount>] [--suppress_popups]\n"
               << "\t[--gpu_number <index of physical device>]\n"
               << "\t[--present_mode <present mode enum>]\n"
+              << "\t[--protected_output]\n"
               << "\t[--width <width>] [--height <height>]\n"
               << "\t<present_mode_enum>\n"
               << "\t\tVK_PRESENT_MODE_IMMEDIATE_KHR = " << VK_PRESENT_MODE_IMMEDIATE_KHR << "\n"
@@ -1054,9 +1214,7 @@
 
     connection = xcb_connect(nullptr, &scr);
     if (xcb_connection_has_error(connection) > 0) {
-        printf(
-            "Cannot find a compatible Vulkan installable client driver "
-            "(ICD).\nExiting ...\n");
+        printf("Cannot connect to XCB.\nExiting ...\n");
         fflush(stdout);
         exit(1);
     }
@@ -1070,7 +1228,7 @@
     display = wl_display_connect(nullptr);
 
     if (display == nullptr) {
-        printf("Cannot find a compatible Vulkan installable client driver (ICD).\nExiting ...\n");
+        printf("Cannot connect to wayland.\nExiting ...\n");
         fflush(stdout);
         exit(1);
     }
@@ -1111,6 +1269,12 @@
     enabled_extension_count = 0;
     enabled_layer_count = 0;
 
+    uint32_t apiVersion = 0;
+    vk::enumerateInstanceVersion(&apiVersion);
+    if (protected_output && apiVersion < VK_MAKE_VERSION(1, 1, 0)) {
+        ERR_EXIT("Need vulkan 1.1 for protected output.", "vkCreateInstance Failure");
+    }
+
     // Look for validation layers
     vk::Bool32 validation_found = VK_FALSE;
     if (validate) {
@@ -1143,13 +1307,21 @@
     vk::Bool32 platformSurfaceExtFound = VK_FALSE;
     memset(extension_names, 0, sizeof(extension_names));
 
-    auto result = vk::enumerateInstanceExtensionProperties(nullptr, &instance_extension_count,
+#if VK_USE_PLATFORM_FUCHSIA
+    const char *kLayer = FUCHSIA_IMAGEPIPE_LAYER;
+    enabled_layers[enabled_layer_count] = kLayer;
+    enabled_layer_count += 1;
+#else
+    const char *kLayer = nullptr;
+#endif
+
+    auto result = vk::enumerateInstanceExtensionProperties(kLayer, &instance_extension_count,
                                                            static_cast<vk::ExtensionProperties *>(nullptr));
     VERIFY(result == vk::Result::eSuccess);
 
     if (instance_extension_count > 0) {
         std::unique_ptr<vk::ExtensionProperties[]> instance_extensions(new vk::ExtensionProperties[instance_extension_count]);
-        result = vk::enumerateInstanceExtensionProperties(nullptr, &instance_extension_count, instance_extensions.get());
+        result = vk::enumerateInstanceExtensionProperties(kLayer, &instance_extension_count, instance_extensions.get());
         VERIFY(result == vk::Result::eSuccess);
 
         for (uint32_t i = 0; i < instance_extension_count; i++) {
@@ -1195,6 +1367,11 @@
                 platformSurfaceExtFound = 1;
                 extension_names[enabled_extension_count++] = VK_EXT_METAL_SURFACE_EXTENSION_NAME;
             }
+#elif defined(VK_USE_PLATFORM_FUCHSIA)
+            if (!strcmp(VK_FUCHSIA_IMAGEPIPE_SURFACE_EXTENSION_NAME, instance_extensions[i].extensionName)) {
+                platformSurfaceExtFound = 1;
+                extension_names[enabled_extension_count++] = VK_FUCHSIA_IMAGEPIPE_SURFACE_EXTENSION_NAME;
+            }
 #endif
             assert(enabled_extension_count < 64);
         }
@@ -1252,6 +1429,13 @@
                  "look at the Getting Started guide for additional "
                  "information.\n",
                  "vkCreateInstance Failure");
+#elif defined(VK_USE_PLATFORM_FUCHSIA)
+        ERR_EXIT("vkEnumerateInstanceExtensionProperties failed to find the " VK_FUCHSIA_IMAGEPIPE_SURFACE_EXTENSION_NAME
+                 " extension.\n\nDo you have a compatible "
+                 "Vulkan installable client driver (ICD) installed?\nPlease "
+                 "look at the Getting Started guide for additional "
+                 "information.\n",
+                 "vkCreateInstance Failure");
 #endif
     }
     auto const app = vk::ApplicationInfo()
@@ -1259,11 +1443,11 @@
                          .setApplicationVersion(0)
                          .setPEngineName(APP_SHORT_NAME)
                          .setEngineVersion(0)
-                         .setApiVersion(VK_API_VERSION_1_0);
+                         .setApiVersion(protected_output ? VK_MAKE_VERSION(1, 1, 0) : VK_MAKE_VERSION(1, 0, 0));
     auto const inst_info = vk::InstanceCreateInfo()
                                .setPApplicationInfo(&app)
                                .setEnabledLayerCount(enabled_layer_count)
-                               .setPpEnabledLayerNames(instance_validation_layers)
+                               .setPpEnabledLayerNames(enabled_layers)
                                .setEnabledExtensionCount(enabled_extension_count)
                                .setPpEnabledExtensionNames(extension_names);
 
@@ -1362,12 +1546,12 @@
     memset(extension_names, 0, sizeof(extension_names));
 
     result =
-        gpu.enumerateDeviceExtensionProperties(nullptr, &device_extension_count, static_cast<vk::ExtensionProperties *>(nullptr));
+        gpu.enumerateDeviceExtensionProperties(kLayer, &device_extension_count, static_cast<vk::ExtensionProperties *>(nullptr));
     VERIFY(result == vk::Result::eSuccess);
 
     if (device_extension_count > 0) {
         std::unique_ptr<vk::ExtensionProperties[]> device_extensions(new vk::ExtensionProperties[device_extension_count]);
-        result = gpu.enumerateDeviceExtensionProperties(nullptr, &device_extension_count, device_extensions.get());
+        result = gpu.enumerateDeviceExtensionProperties(kLayer, &device_extension_count, device_extensions.get());
         VERIFY(result == vk::Result::eSuccess);
 
         for (uint32_t i = 0; i < device_extension_count; i++) {
@@ -1392,6 +1576,10 @@
 
     gpu.getProperties(&gpu_props);
 
+    if (protected_output && gpu_props.apiVersion < VK_MAKE_VERSION(1, 1, 0)) {
+        ERR_EXIT("Need vulkan physical device 1.1 for protected output.", "vkcube");
+    }
+
     /* Call with nullptr data to get count */
     gpu.getQueueFamilyProperties(&queue_family_count, static_cast<vk::QueueFamilyProperties *>(nullptr));
     assert(queue_family_count >= 1);
@@ -1455,6 +1643,16 @@
         auto result = create_display_surface();
         VERIFY(result == vk::Result::eSuccess);
     }
+#elif defined(VK_USE_PLATFORM_FUCHSIA)
+    {
+        auto createInfo = vk::ImagePipeSurfaceCreateInfoFUCHSIA();
+#if FUCHSIA_USE_SCENIC
+        createInfo.setImagePipeHandle(image_pipe_handle.release());
+#endif
+
+        auto result = inst.createImagePipeSurfaceFUCHSIA(&createInfo, nullptr, &surface);
+        VERIFY(result == vk::Result::eSuccess);
+    }
 #endif
 }
 
@@ -1505,7 +1703,16 @@
 
     create_device();
 
-    device.getQueue(graphics_queue_family_index, 0, &graphics_queue);
+    if (protected_output) {
+        auto const queue_info2 = vk::DeviceQueueInfo2()
+                                     .setFlags(vk::DeviceQueueCreateFlagBits::eProtected)
+                                     .setQueueFamilyIndex(graphics_queue_family_index)
+                                     .setQueueIndex(0);
+        device.getQueue2(&queue_info2, &graphics_queue);
+    } else {
+        device.getQueue(graphics_queue_family_index, 0, &graphics_queue);
+    }
+
     if (!separate_present_queue) {
         present_queue = graphics_queue;
     } else {
@@ -1564,7 +1771,10 @@
 }
 
 void Demo::prepare() {
-    auto const cmd_pool_info = vk::CommandPoolCreateInfo().setQueueFamilyIndex(graphics_queue_family_index);
+    auto cmd_pool_info = vk::CommandPoolCreateInfo().setQueueFamilyIndex(graphics_queue_family_index);
+    if (protected_output) {
+        cmd_pool_info.setFlags(vk::CommandPoolCreateFlagBits::eProtected);
+    }
     auto result = device.createCommandPool(&cmd_pool_info, nullptr, &cmd_pool);
     VERIFY(result == vk::Result::eSuccess);
 
@@ -1754,22 +1964,25 @@
         }
     }
 
-    auto const swapchain_ci = vk::SwapchainCreateInfoKHR()
-                                  .setSurface(surface)
-                                  .setMinImageCount(desiredNumOfSwapchainImages)
-                                  .setImageFormat(format)
-                                  .setImageColorSpace(color_space)
-                                  .setImageExtent({swapchainExtent.width, swapchainExtent.height})
-                                  .setImageArrayLayers(1)
-                                  .setImageUsage(vk::ImageUsageFlagBits::eColorAttachment)
-                                  .setImageSharingMode(vk::SharingMode::eExclusive)
-                                  .setQueueFamilyIndexCount(0)
-                                  .setPQueueFamilyIndices(nullptr)
-                                  .setPreTransform(preTransform)
-                                  .setCompositeAlpha(compositeAlpha)
-                                  .setPresentMode(swapchainPresentMode)
-                                  .setClipped(true)
-                                  .setOldSwapchain(oldSwapchain);
+    auto swapchain_ci = vk::SwapchainCreateInfoKHR()
+                            .setSurface(surface)
+                            .setMinImageCount(desiredNumOfSwapchainImages)
+                            .setImageFormat(format)
+                            .setImageColorSpace(color_space)
+                            .setImageExtent({swapchainExtent.width, swapchainExtent.height})
+                            .setImageArrayLayers(1)
+                            .setImageUsage(vk::ImageUsageFlagBits::eColorAttachment)
+                            .setImageSharingMode(vk::SharingMode::eExclusive)
+                            .setQueueFamilyIndexCount(0)
+                            .setPQueueFamilyIndices(nullptr)
+                            .setPreTransform(preTransform)
+                            .setCompositeAlpha(compositeAlpha)
+                            .setPresentMode(swapchainPresentMode)
+                            .setClipped(true)
+                            .setOldSwapchain(oldSwapchain);
+    if (protected_output) {
+        swapchain_ci.setFlags(vk::SwapchainCreateFlagBitsKHR::eProtected);
+    }
 
     result = device.createSwapchainKHR(&swapchain_ci, nullptr, &swapchain);
     VERIFY(result == vk::Result::eSuccess);
@@ -2000,7 +2213,11 @@
 
 vk::ShaderModule Demo::prepare_fs() {
     const uint32_t fragShaderCode[] = {
+#ifdef CUBE_FRAG_INC
+#include CUBE_FRAG_INC
+#else
 #include "cube.frag.inc"
+#endif
     };
 
     frag_shader_module = prepare_shader_module(fragShaderCode, sizeof(fragShaderCode));
@@ -2325,7 +2542,7 @@
                              textures[i].imageLayout, vk::AccessFlagBits::eTransferWrite, vk::PipelineStageFlagBits::eTransfer,
                              vk::PipelineStageFlagBits::eFragmentShader);
         } else {
-            assert(!"No support for R8G8B8A8_UNORM as texture image format");
+            assert(false && "No support for R8G8B8A8_UNORM as texture image format");
         }
 
         auto const samplerInfo = vk::SamplerCreateInfo()
@@ -2361,7 +2578,11 @@
 
 vk::ShaderModule Demo::prepare_vs() {
     const uint32_t vertShaderCode[] = {
+#ifdef CUBE_VERT_INC
+#include CUBE_VERT_INC
+#else
 #include "cube.vert.inc"
+#endif
     };
 
     vert_shader_module = prepare_shader_module(vertShaderCode, sizeof(vertShaderCode));
@@ -2493,7 +2714,12 @@
 }
 
 /* Convert ppm image data from header file into RGBA texture image */
+#ifdef TEXTURE_PPM_H
+#include TEXTURE_PPM_H
+#else
 #include "lunarg.ppm.h"
+#endif
+
 bool Demo::loadTexture(const char *filename, uint8_t *rgba_data, vk::SubresourceLayout *layout, int32_t *width, int32_t *height) {
     (void)filename;
     char *cPtr;
@@ -2808,57 +3034,39 @@
 void Demo::run() {
     while (!quit) {
         if (pause) {
-            wl_display_dispatch(display);
-        } else {
-            wl_display_dispatch_pending(display);
-            update_data_buffer();
-            draw();
-            curFrame++;
-            if (frameCount != UINT32_MAX && curFrame == frameCount) {
+            if (wl_display_dispatch(display) < 0) {
                 quit = true;
             }
+        } else {
+            if (wl_display_dispatch_pending(display) < 0) {
+                quit = true;
+            } else {
+                update_data_buffer();
+                draw();
+                curFrame++;
+                if (frameCount != UINT32_MAX && curFrame == frameCount) {
+                    quit = true;
+                }
+            }
         }
     }
 }
 
-static void handle_surface_configure(void *data, xdg_surface *xdg_surface, uint32_t serial) {
-    Demo *demo = (Demo *)data;
-    xdg_surface_ack_configure(xdg_surface, serial);
-    if (demo->xdg_surface_has_been_configured) {
-        demo->resize();
-    }
-    demo->xdg_surface_has_been_configured = true;
-}
-
-static const xdg_surface_listener surface_listener = {handle_surface_configure};
-
-static void handle_toplevel_configure(void *data, xdg_toplevel *xdg_toplevel, int32_t width, int32_t height,
-                                      struct wl_array *states) {
-    Demo *demo = (Demo *)data;
-    /* zero values imply the program may choose its own size, so in that case
-     * stay with the existing value (which on startup is the default) */
-    if (width > 0) {
-        demo->width = width;
-    }
-    if (height > 0) {
-        demo->height = height;
-    }
-    // This will be followed by a surface configure
-}
-
-static void handle_toplevel_close(void *data, xdg_toplevel *xdg_toplevel) {
-    Demo *demo = (Demo *)data;
-    demo->quit = true;
-}
-
-static const xdg_toplevel_listener toplevel_listener = {handle_toplevel_configure, handle_toplevel_close};
-
 void Demo::create_window() {
+#if defined(USE_XDG_SHELL)
+    if (!shell) {
+        printf("Compositor did not provide the standard protocol shell\n");
+        fflush(stdout);
+        exit(1);
+    }
+    zxdg_shell_v6_add_listener(shell, &shell_listener, this);
+#else
     if (!wm_base) {
         printf("Compositor did not provide the standard protocol xdg-wm-base\n");
         fflush(stdout);
         exit(1);
     }
+#endif
 
     window = wl_compositor_create_surface(compositor);
     if (!window) {
@@ -2867,6 +3075,23 @@
         exit(1);
     }
 
+#if defined(USE_XDG_SHELL)
+    window_surface = zxdg_shell_v6_get_xdg_surface(shell, window);
+    if (!window_surface) {
+        printf("Can not get xdg_surface from wayland_surface!\n");
+        fflush(stdout);
+        exit(1);
+    }
+    window_toplevel = zxdg_surface_v6_get_toplevel(window_surface);
+    if (!window_toplevel) {
+        printf("Can not allocate xdg_toplevel for xdg_surface!\n");
+        fflush(stdout);
+        exit(1);
+    }
+    zxdg_surface_v6_add_listener(window_surface, &surface_listener, this);
+    zxdg_toplevel_v6_add_listener(window_toplevel, &toplevel_listener, this);
+    zxdg_toplevel_v6_set_title(window_toplevel, APP_SHORT_NAME);
+#else
     window_surface = xdg_wm_base_get_xdg_surface(wm_base, window);
     if (!window_surface) {
         printf("Can not get xdg_surface from wayland_surface!\n");
@@ -2888,6 +3113,11 @@
         zxdg_toplevel_decoration_v1_set_mode(toplevel_decoration, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
     }
 
+    wl_shell_surface_add_listener(shell_surface, &shell_surface_listener, this);
+    wl_shell_surface_set_toplevel(shell_surface);
+    wl_shell_surface_set_title(shell_surface, APP_SHORT_NAME);
+#endif // USE_XDG_SHELL
+
     wl_surface_commit(window);
 }
 #elif defined(VK_USE_PLATFORM_DIRECTFB_EXT)
@@ -3112,6 +3342,79 @@
         }
     }
 }
+#elif defined(__Fuchsia__)
+
+#if FUCHSIA_USE_SCENIC
+void Demo::create_imagepipe_view() {
+    if (imagepipe_view) return;
+
+    context = sys::ComponentContext::CreateAndServeOutgoingDirectory();
+
+    ImagePipeViewProviderService::CreateViewCallback create_view_callback = [this](fuchsia::ui::views::ViewToken view_token,
+                                                                                   fuchsia::ui::views::ViewRefControl control_ref,
+                                                                                   fuchsia::ui::views::ViewRef view_ref) {
+        auto resize_callback = [this](float width, float height) {
+            this->width = static_cast<uint32_t>(width);
+            this->height = static_cast<uint32_t>(height);
+            if (prepared) {
+                resize();
+            }
+        };
+
+        imagepipe_view = ImagePipeView::Create(context.get(), std::move(view_token), std::move(control_ref), std::move(view_ref),
+                                               resize_callback);
+        if (!imagepipe_view) ERR_EXIT("Failed to created ImagePipeView", "create_imagepipe_view failure");
+
+        image_pipe_handle = imagepipe_view->TakeImagePipeChannel();
+    };
+
+    view_provider_service = std::make_unique<ImagePipeViewProviderService>(context.get(), std::move(create_view_callback));
+
+    zx_status_t loop_status = ZX_OK;
+
+    // Run message loop until view has been created.
+    while (!quit && !imagepipe_view && loop_status == ZX_OK) {
+        loop_status = loop.RunUntilIdle();
+    }
+}
+#endif
+
+void Demo::run() {
+    uint32_t num_frames = 60;
+    uint32_t elapsed_frames = 0;
+    static const float kMsPerSec = 1000;
+
+    double total_ms = 0;
+    auto t0 = std::chrono::high_resolution_clock::now();
+
+    while (!quit) {
+#if FUCHSIA_USE_SCENIC
+        if (loop.RunUntilIdle() != ZX_OK) break;
+#endif
+        auto t1 = std::chrono::high_resolution_clock::now();
+        std::chrono::duration<double, std::milli> elapsed = t1 - t0;
+        total_ms += elapsed.count();
+        t0 = t1;
+
+        if (elapsed_frames && (elapsed_frames % num_frames) == 0) {
+            float fps = static_cast<float>(num_frames / (total_ms / kMsPerSec));
+            printf("Framerate average for last %u frames: %f frames per second\n", num_frames, fps);
+            fflush(stdout);
+            total_ms = 0;
+            // attempt to log once per second
+            num_frames = static_cast<uint32_t>(fps);
+            elapsed_frames = 0;
+        }
+
+        draw();
+
+        curFrame++;
+        elapsed_frames++;
+
+        if (frameCount != UINT32_MAX && curFrame == frameCount) quit = true;
+    }
+}
+
 #endif
 
 #if _WIN32
@@ -3256,7 +3559,7 @@
     return (int)msg.wParam;
 }
 
-#elif defined(__linux__) || defined(__FreeBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__Fuchsia__)
 
 int main(int argc, char **argv) {
     Demo demo;
@@ -3270,6 +3573,8 @@
     demo.create_xlib_window();
 #elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
     demo.create_window();
+#elif defined(VK_USE_PLATFORM_FUCHSIA) && FUCHSIA_USE_SCENIC
+    demo.create_imagepipe_view();
 #elif defined(VK_USE_PLATFORM_DIRECTFB_EXT)
     demo.create_directfb_window();
 #endif
@@ -3288,6 +3593,8 @@
     demo.run_directfb();
 #elif defined(VK_USE_PLATFORM_DISPLAY_KHR)
     demo.run_display();
+#elif defined(VK_USE_PLATFORM_FUCHSIA)
+    demo.run();
 #endif
 
     demo.cleanup();
diff --git a/cube/fuchsia/imagepipe_view.cpp b/cube/fuchsia/imagepipe_view.cpp
new file mode 100644
index 0000000..5ff5428
--- /dev/null
+++ b/cube/fuchsia/imagepipe_view.cpp
@@ -0,0 +1,144 @@
+// Copyright 2019 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "imagepipe_view.h"
+
+#include <lib/syslog/global.h>
+#include <lib/ui/scenic/cpp/view_ref_pair.h>
+
+enum {
+    kViewId = 1,
+    kRootNodeId = 2,
+    kMaterialId = 3,
+    kShapeNodeId = 4,
+    kImagePipeId = 5,
+    kFirstNewResourceId = 6,
+};
+
+std::unique_ptr<ImagePipeView> ImagePipeView::Create(sys::ComponentContext* context, fuchsia::ui::views::ViewToken view_token,
+                                                     fuchsia::ui::views::ViewRefControl control_ref,
+                                                     fuchsia::ui::views::ViewRef view_ref, ResizeCallback resize_callback) {
+    if (!resize_callback) return nullptr;
+
+    auto view = std::make_unique<ImagePipeView>(std::move(resize_callback));
+
+    if (!view->Init(context, std::move(view_token), std::move(control_ref), std::move(view_ref))) return nullptr;
+
+    return view;
+}
+
+ImagePipeView::ImagePipeView(ResizeCallback resize_callback)
+    : session_listener_binding_(this), resize_callback_(std::move(resize_callback)), new_resource_id_(kFirstNewResourceId) {}
+
+static void PushCommand(std::vector<fuchsia::ui::scenic::Command>* cmds, fuchsia::ui::gfx::Command cmd) {
+    // Wrap the gfx::Command in a scenic::Command, then push it.
+    cmds->push_back(scenic::NewCommand(std::move(cmd)));
+}
+
+bool ImagePipeView::Init(sys::ComponentContext* context, fuchsia::ui::views::ViewToken view_token,
+                         fuchsia::ui::views::ViewRefControl control_ref, fuchsia::ui::views::ViewRef view_ref) {
+    fuchsia::ui::scenic::ScenicPtr scenic = context->svc()->Connect<fuchsia::ui::scenic::Scenic>();
+
+    scenic->CreateSession(session_.NewRequest(), session_listener_binding_.NewBinding());
+
+    zx::channel remote_endpoint;
+    zx_status_t status = zx::channel::create(0, &image_pipe_endpoint_, &remote_endpoint);
+    if (status != ZX_OK) {
+        FX_LOGF(ERROR, "ImagePipeView", "Init: failed to create channel (%d)", status);
+        return false;
+    }
+
+    std::vector<fuchsia::ui::scenic::Command> cmds;
+
+    PushCommand(&cmds, scenic::NewCreateViewCmd(kViewId, std::move(view_token), std::move(control_ref), std::move(view_ref),
+                                                "imagepipe_view"));
+    PushCommand(&cmds, scenic::NewCreateEntityNodeCmd(kRootNodeId));
+    PushCommand(&cmds, scenic::NewAddChildCmd(kViewId, kRootNodeId));
+    PushCommand(&cmds, scenic::NewCreateMaterialCmd(kMaterialId));
+    PushCommand(&cmds, scenic::NewCreateImagePipe2Cmd(
+                           kImagePipeId, fidl::InterfaceRequest<fuchsia::images::ImagePipe2>(std::move(remote_endpoint))));
+    PushCommand(&cmds, scenic::NewSetTextureCmd(kMaterialId, kImagePipeId));
+    PushCommand(&cmds, scenic::NewCreateShapeNodeCmd(kShapeNodeId));
+    PushCommand(&cmds, scenic::NewSetMaterialCmd(kShapeNodeId, kMaterialId));
+    PushCommand(&cmds, scenic::NewAddChildCmd(kRootNodeId, kShapeNodeId));
+
+    session_->Enqueue(std::move(cmds));
+    session_->Present(0,                                             // presentation time
+                      {},                                            // acquire fences
+                      {},                                            // release fences
+                      [](fuchsia::images::PresentationInfo info) {}  // presentation callback
+    );
+    return true;
+}
+
+static bool IsViewPropertiesChangedEvent(const fuchsia::ui::scenic::Event& event) {
+    return (event.Which() == fuchsia::ui::scenic::Event::Tag::kGfx) &&
+           (event.gfx().Which() == fuchsia::ui::gfx::Event::Tag::kViewPropertiesChanged);
+}
+
+// |fuchsia::ui::scenic::SessionListener|
+void ImagePipeView::OnScenicEvent(std::vector<fuchsia::ui::scenic::Event> events) {
+    for (auto& event : events) {
+        if (IsViewPropertiesChangedEvent(event)) {
+            OnViewPropertiesChanged(event.gfx().view_properties_changed().properties);
+        }
+    }
+}
+
+void ImagePipeView::OnViewPropertiesChanged(fuchsia::ui::gfx::ViewProperties vp) {
+    view_width_ = (vp.bounding_box.max.x - vp.inset_from_max.x) - (vp.bounding_box.min.x + vp.inset_from_min.x);
+    view_height_ = (vp.bounding_box.max.y - vp.inset_from_max.y) - (vp.bounding_box.min.y + vp.inset_from_min.y);
+
+    if (view_width_ == 0 || view_height_ == 0) return;
+
+    std::vector<fuchsia::ui::scenic::Command> cmds;
+
+    int shape_id = new_resource_id_++;
+    PushCommand(&cmds, scenic::NewCreateRectangleCmd(shape_id, view_width_, view_height_));
+    PushCommand(&cmds, scenic::NewSetShapeCmd(kShapeNodeId, shape_id));
+    PushCommand(&cmds, scenic::NewReleaseResourceCmd(shape_id));
+
+    // Position is relative to the View's origin system.
+    const float center_x = view_width_ * .5f;
+    const float center_y = view_height_ * .5f;
+
+    constexpr float kBackgroundElevation = 0.f;
+    PushCommand(&cmds, scenic::NewSetTranslationCmd(kShapeNodeId, {center_x, center_y, -kBackgroundElevation}));
+
+    session_->Enqueue(std::move(cmds));
+    session_->Present(0,                                             // presentation time
+                      {},                                            // acquire fences
+                      {},                                            // release fences
+                      [](fuchsia::images::PresentationInfo info) {}  // presentation callback
+    );
+    resize_callback_(view_width_, view_height_);
+}
+
+// |fuchsia::ui::scenic::SessionListener|
+void ImagePipeView::OnScenicError(std::string error) { FX_LOGF(ERROR, "ImagePipeView", "OnScenicError: %s", error.c_str()); }
+
+ImagePipeViewProviderService::ImagePipeViewProviderService(sys::ComponentContext* context, CreateViewCallback create_view_callback)
+    : create_view_callback_(std::move(create_view_callback)) {
+    context->outgoing()->AddPublicService<fuchsia::ui::app::ViewProvider>(
+        [this](fidl::InterfaceRequest<fuchsia::ui::app::ViewProvider> request) {
+            this->HandleViewProviderRequest(std::move(request));
+        });
+}
+
+void ImagePipeViewProviderService::CreateView(zx::eventpair view_token,
+                                              fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> incoming_services,
+                                              fidl::InterfaceHandle<fuchsia::sys::ServiceProvider> outgoing_services) {
+    auto [view_ref_control, view_ref] = scenic::ViewRefPair::New();
+    CreateViewWithViewRef(std::move(view_token), std::move(view_ref_control), std::move(view_ref));
+}
+
+void ImagePipeViewProviderService::CreateViewWithViewRef(zx::eventpair view_token,
+                                                         fuchsia::ui::views::ViewRefControl view_ref_control,
+                                                         fuchsia::ui::views::ViewRef view_ref) {
+    create_view_callback_(scenic::ToViewToken(std::move(view_token)), std::move(view_ref_control), std::move(view_ref));
+}
+
+void ImagePipeViewProviderService::HandleViewProviderRequest(fidl::InterfaceRequest<fuchsia::ui::app::ViewProvider> request) {
+    bindings_.AddBinding(this, std::move(request));
+}
diff --git a/cube/fuchsia/imagepipe_view.h b/cube/fuchsia/imagepipe_view.h
new file mode 100644
index 0000000..0300f59
--- /dev/null
+++ b/cube/fuchsia/imagepipe_view.h
@@ -0,0 +1,80 @@
+// Copyright 2019 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef THIRD_PARTY_VULKAN_TOOLS_CUBE_FUCHSIA_IMAGEPIPE_VIEW_H_
+#define THIRD_PARTY_VULKAN_TOOLS_CUBE_FUCHSIA_IMAGEPIPE_VIEW_H_
+
+#include <fuchsia/images/cpp/fidl.h>
+#include <fuchsia/ui/app/cpp/fidl.h>
+#include <fuchsia/ui/gfx/cpp/fidl.h>
+#include <lib/fidl/cpp/binding_set.h>
+#include <lib/fit/function.h>
+#include <lib/sys/cpp/component_context.h>
+#include <lib/ui/scenic/cpp/commands.h>
+#include <lib/ui/scenic/cpp/view_token_pair.h>
+
+#include <memory>
+
+// This class provides a convenient wrapper around the scenic fidl apis
+// needed to get an imagepipe. Only SDK available constructs should be used so
+// that this code may be leveraged by Vulkan applications built with the SDK.
+class ImagePipeView : public fuchsia::ui::scenic::SessionListener {
+  public:
+    using ResizeCallback = fit::function<void(float width, float height)>;
+
+    static std::unique_ptr<ImagePipeView> Create(sys::ComponentContext* context, fuchsia::ui::views::ViewToken view_token,
+                                                 fuchsia::ui::views::ViewRefControl control_ref,
+                                                 fuchsia::ui::views::ViewRef view_ref, ResizeCallback resize_callback);
+
+    ImagePipeView(ResizeCallback resize_callback);
+
+    zx::channel TakeImagePipeChannel() { return std::move(image_pipe_endpoint_); }
+
+    bool Init(sys::ComponentContext* context, fuchsia::ui::views::ViewToken view_token,
+              fuchsia::ui::views::ViewRefControl control_ref, fuchsia::ui::views::ViewRef view_ref);
+
+    // fuchsia::ui::scenic::SessionListener methods.
+    void OnScenicEvent(std::vector<fuchsia::ui::scenic::Event> events) override;
+    void OnScenicError(std::string error) override;
+
+  private:
+    void OnViewPropertiesChanged(fuchsia::ui::gfx::ViewProperties vp);
+
+    fidl::Binding<fuchsia::ui::scenic::SessionListener> session_listener_binding_;
+    fuchsia::ui::scenic::SessionPtr session_;
+    zx::channel image_pipe_endpoint_;
+    ResizeCallback resize_callback_;
+
+    int new_resource_id_;
+
+    float view_width_ = 0;
+    float view_height_ = 0;
+
+    friend class ImagePipeViewTest;
+};
+
+class ImagePipeViewProviderService : public fuchsia::ui::app::ViewProvider {
+  public:
+    using CreateViewCallback =
+        fit::function<void(fuchsia::ui::views::ViewToken view_token, fuchsia::ui::views::ViewRefControl control_ref,
+                           fuchsia::ui::views::ViewRef view_ref)>;
+
+    ImagePipeViewProviderService(sys::ComponentContext* context, CreateViewCallback create_view_callback);
+
+    // fuchsia::ui::app::ViewProvider methods.
+    void CreateView(zx::eventpair view_token, fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> incoming_services,
+                    fidl::InterfaceHandle<fuchsia::sys::ServiceProvider> outgoing_services) override;
+
+    // |fuchsia::ui::app::ViewProvider|
+    void CreateViewWithViewRef(zx::eventpair view_token, fuchsia::ui::views::ViewRefControl view_ref_control,
+                               fuchsia::ui::views::ViewRef view_ref) override;
+
+  private:
+    void HandleViewProviderRequest(fidl::InterfaceRequest<fuchsia::ui::app::ViewProvider> request);
+
+    CreateViewCallback create_view_callback_;
+    fidl::BindingSet<ViewProvider> bindings_;
+};
+
+#endif  // THIRD_PARTY_VULKAN_TOOLS_CUBE_FUCHSIA_IMAGEPIPE_VIEW_H_
diff --git a/cube/fuchsia/meta/vkcube-on-fb.cmx b/cube/fuchsia/meta/vkcube-on-fb.cmx
new file mode 100644
index 0000000..be8f0fb
--- /dev/null
+++ b/cube/fuchsia/meta/vkcube-on-fb.cmx
@@ -0,0 +1,14 @@
+{
+    "include": [
+        "syslog/client.shard.cmx",
+        "//src/lib/vulkan/application.shard.cmx"
+    ],
+    "program": {
+        "binary": "bin/vkcube-on-fb"
+    },
+    "sandbox": {
+        "dev": [
+            "class/display-controller"
+        ]
+    }
+}
diff --git a/cube/fuchsia/meta/vkcube-on-scenic.cmx b/cube/fuchsia/meta/vkcube-on-scenic.cmx
new file mode 100644
index 0000000..66fc668
--- /dev/null
+++ b/cube/fuchsia/meta/vkcube-on-scenic.cmx
@@ -0,0 +1,14 @@
+{
+    "include": [
+        "syslog/client.shard.cmx",
+        "//src/lib/vulkan/application.shard.cmx"
+    ],
+    "program": {
+        "binary": "bin/vkcube-on-scenic"
+    },
+    "sandbox": {
+        "services": [
+            "fuchsia.ui.scenic.Scenic"
+        ]
+    }
+}
diff --git a/cube/fuchsia/meta/vkcube-skip-present.cmx b/cube/fuchsia/meta/vkcube-skip-present.cmx
new file mode 100644
index 0000000..cc944d2
--- /dev/null
+++ b/cube/fuchsia/meta/vkcube-skip-present.cmx
@@ -0,0 +1,14 @@
+{
+    "include": [
+        "syslog/client.shard.cmx",
+        "//src/lib/vulkan/application.shard.cmx"
+    ],
+    "program": {
+        "binary": "bin/vkcube-skip-present"
+    },
+    "sandbox": {
+        "dev": [
+            "class/display-controller"
+        ]
+    }
+}
diff --git a/cube/xdg-shell-unstable-v6.c b/cube/xdg-shell-unstable-v6.c
new file mode 100644
index 0000000..be0316e
--- /dev/null
+++ b/cube/xdg-shell-unstable-v6.c
@@ -0,0 +1,162 @@
+/* Generated by wayland-scanner 1.16.0 */
+
+/*
+ * Copyright © 2008-2013 Kristian Høgsberg
+ * Copyright © 2013      Rafael Antognolli
+ * Copyright © 2013      Jasper St. Pierre
+ * Copyright © 2010-2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <wayland-util.h>
+
+extern const struct wl_interface wl_output_interface;
+extern const struct wl_interface wl_seat_interface;
+extern const struct wl_interface wl_surface_interface;
+extern const struct wl_interface zxdg_popup_v6_interface;
+extern const struct wl_interface zxdg_positioner_v6_interface;
+extern const struct wl_interface zxdg_surface_v6_interface;
+extern const struct wl_interface zxdg_toplevel_v6_interface;
+
+static const struct wl_interface *types[] = {
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  &zxdg_positioner_v6_interface,
+  &zxdg_surface_v6_interface,
+  &wl_surface_interface,
+  &zxdg_toplevel_v6_interface,
+  &zxdg_popup_v6_interface,
+  &zxdg_surface_v6_interface,
+  &zxdg_positioner_v6_interface,
+  &zxdg_toplevel_v6_interface,
+  &wl_seat_interface,
+  NULL,
+  NULL,
+  NULL,
+  &wl_seat_interface,
+  NULL,
+  &wl_seat_interface,
+  NULL,
+  NULL,
+  &wl_output_interface,
+  &wl_seat_interface,
+  NULL,
+};
+
+static const struct wl_message zxdg_shell_v6_requests[] = {
+  { "destroy", "", types + 0 },
+  { "create_positioner", "n", types + 4 },
+  { "get_xdg_surface", "no", types + 5 },
+  { "pong", "u", types + 0 },
+};
+
+static const struct wl_message zxdg_shell_v6_events[] = {
+  { "ping", "u", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface zxdg_shell_v6_interface = {
+  "zxdg_shell_v6", 1,
+  4, zxdg_shell_v6_requests,
+  1, zxdg_shell_v6_events,
+};
+
+static const struct wl_message zxdg_positioner_v6_requests[] = {
+  { "destroy", "", types + 0 },
+  { "set_size", "ii", types + 0 },
+  { "set_anchor_rect", "iiii", types + 0 },
+  { "set_anchor", "u", types + 0 },
+  { "set_gravity", "u", types + 0 },
+  { "set_constraint_adjustment", "u", types + 0 },
+  { "set_offset", "ii", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface zxdg_positioner_v6_interface = {
+  "zxdg_positioner_v6", 1,
+  7, zxdg_positioner_v6_requests,
+  0, NULL,
+};
+
+static const struct wl_message zxdg_surface_v6_requests[] = {
+  { "destroy", "", types + 0 },
+  { "get_toplevel", "n", types + 7 },
+  { "get_popup", "noo", types + 8 },
+  { "set_window_geometry", "iiii", types + 0 },
+  { "ack_configure", "u", types + 0 },
+};
+
+static const struct wl_message zxdg_surface_v6_events[] = {
+  { "configure", "u", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface zxdg_surface_v6_interface = {
+  "zxdg_surface_v6", 1,
+  5, zxdg_surface_v6_requests,
+  1, zxdg_surface_v6_events,
+};
+
+static const struct wl_message zxdg_toplevel_v6_requests[] = {
+  { "destroy", "", types + 0 },
+  { "set_parent", "?o", types + 11 },
+  { "set_title", "s", types + 0 },
+  { "set_app_id", "s", types + 0 },
+  { "show_window_menu", "ouii", types + 12 },
+  { "move", "ou", types + 16 },
+  { "resize", "ouu", types + 18 },
+  { "set_max_size", "ii", types + 0 },
+  { "set_min_size", "ii", types + 0 },
+  { "set_maximized", "", types + 0 },
+  { "unset_maximized", "", types + 0 },
+  { "set_fullscreen", "?o", types + 21 },
+  { "unset_fullscreen", "", types + 0 },
+  { "set_minimized", "", types + 0 },
+};
+
+static const struct wl_message zxdg_toplevel_v6_events[] = {
+  { "configure", "iia", types + 0 },
+  { "close", "", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface zxdg_toplevel_v6_interface = {
+  "zxdg_toplevel_v6", 1,
+  14, zxdg_toplevel_v6_requests,
+  2, zxdg_toplevel_v6_events,
+};
+
+static const struct wl_message zxdg_popup_v6_requests[] = {
+  { "destroy", "", types + 0 },
+  { "grab", "ou", types + 22 },
+};
+
+static const struct wl_message zxdg_popup_v6_events[] = {
+  { "configure", "iiii", types + 0 },
+  { "popup_done", "", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface zxdg_popup_v6_interface = {
+  "zxdg_popup_v6", 1,
+  2, zxdg_popup_v6_requests,
+  2, zxdg_popup_v6_events,
+};
+
diff --git a/cube/xdg-shell-unstable-v6.h b/cube/xdg-shell-unstable-v6.h
new file mode 100644
index 0000000..aff7d6e
--- /dev/null
+++ b/cube/xdg-shell-unstable-v6.h
@@ -0,0 +1,1750 @@
+/* Generated by wayland-scanner 1.16.0 */
+
+#ifndef XDG_SHELL_UNSTABLE_V6_CLIENT_PROTOCOL_H
+#define XDG_SHELL_UNSTABLE_V6_CLIENT_PROTOCOL_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include <wayland-client.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @page page_xdg_shell_unstable_v6 The xdg_shell_unstable_v6 protocol
+ * @section page_ifaces_xdg_shell_unstable_v6 Interfaces
+ * - @subpage page_iface_zxdg_shell_v6 - create desktop-style surfaces
+ * - @subpage page_iface_zxdg_positioner_v6 - child surface positioner
+ * - @subpage page_iface_zxdg_surface_v6 - desktop user interface surface base interface
+ * - @subpage page_iface_zxdg_toplevel_v6 - toplevel surface
+ * - @subpage page_iface_zxdg_popup_v6 - short-lived, popup surfaces for menus
+ * @section page_copyright_xdg_shell_unstable_v6 Copyright
+ * <pre>
+ *
+ * Copyright © 2008-2013 Kristian Høgsberg
+ * Copyright © 2013      Rafael Antognolli
+ * Copyright © 2013      Jasper St. Pierre
+ * Copyright © 2010-2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * </pre>
+ */
+struct wl_output;
+struct wl_seat;
+struct wl_surface;
+struct zxdg_popup_v6;
+struct zxdg_positioner_v6;
+struct zxdg_shell_v6;
+struct zxdg_surface_v6;
+struct zxdg_toplevel_v6;
+
+/**
+ * @page page_iface_zxdg_shell_v6 zxdg_shell_v6
+ * @section page_iface_zxdg_shell_v6_desc Description
+ *
+ * xdg_shell allows clients to turn a wl_surface into a "real window"
+ * which can be dragged, resized, stacked, and moved around by the
+ * user. Everything about this interface is suited towards traditional
+ * desktop environments.
+ * @section page_iface_zxdg_shell_v6_api API
+ * See @ref iface_zxdg_shell_v6.
+ */
+/**
+ * @defgroup iface_zxdg_shell_v6 The zxdg_shell_v6 interface
+ *
+ * xdg_shell allows clients to turn a wl_surface into a "real window"
+ * which can be dragged, resized, stacked, and moved around by the
+ * user. Everything about this interface is suited towards traditional
+ * desktop environments.
+ */
+extern const struct wl_interface zxdg_shell_v6_interface;
+/**
+ * @page page_iface_zxdg_positioner_v6 zxdg_positioner_v6
+ * @section page_iface_zxdg_positioner_v6_desc Description
+ *
+ * The xdg_positioner provides a collection of rules for the placement of a
+ * child surface relative to a parent surface. Rules can be defined to ensure
+ * the child surface remains within the visible area's borders, and to
+ * specify how the child surface changes its position, such as sliding along
+ * an axis, or flipping around a rectangle. These positioner-created rules are
+ * constrained by the requirement that a child surface must intersect with or
+ * be at least partially adjacent to its parent surface.
+ *
+ * See the various requests for details about possible rules.
+ *
+ * At the time of the request, the compositor makes a copy of the rules
+ * specified by the xdg_positioner. Thus, after the request is complete the
+ * xdg_positioner object can be destroyed or reused; further changes to the
+ * object will have no effect on previous usages.
+ *
+ * For an xdg_positioner object to be considered complete, it must have a
+ * non-zero size set by set_size, and a non-zero anchor rectangle set by
+ * set_anchor_rect. Passing an incomplete xdg_positioner object when
+ * positioning a surface raises an error.
+ * @section page_iface_zxdg_positioner_v6_api API
+ * See @ref iface_zxdg_positioner_v6.
+ */
+/**
+ * @defgroup iface_zxdg_positioner_v6 The zxdg_positioner_v6 interface
+ *
+ * The xdg_positioner provides a collection of rules for the placement of a
+ * child surface relative to a parent surface. Rules can be defined to ensure
+ * the child surface remains within the visible area's borders, and to
+ * specify how the child surface changes its position, such as sliding along
+ * an axis, or flipping around a rectangle. These positioner-created rules are
+ * constrained by the requirement that a child surface must intersect with or
+ * be at least partially adjacent to its parent surface.
+ *
+ * See the various requests for details about possible rules.
+ *
+ * At the time of the request, the compositor makes a copy of the rules
+ * specified by the xdg_positioner. Thus, after the request is complete the
+ * xdg_positioner object can be destroyed or reused; further changes to the
+ * object will have no effect on previous usages.
+ *
+ * For an xdg_positioner object to be considered complete, it must have a
+ * non-zero size set by set_size, and a non-zero anchor rectangle set by
+ * set_anchor_rect. Passing an incomplete xdg_positioner object when
+ * positioning a surface raises an error.
+ */
+extern const struct wl_interface zxdg_positioner_v6_interface;
+/**
+ * @page page_iface_zxdg_surface_v6 zxdg_surface_v6
+ * @section page_iface_zxdg_surface_v6_desc Description
+ *
+ * An interface that may be implemented by a wl_surface, for
+ * implementations that provide a desktop-style user interface.
+ *
+ * It provides a base set of functionality required to construct user
+ * interface elements requiring management by the compositor, such as
+ * toplevel windows, menus, etc. The types of functionality are split into
+ * xdg_surface roles.
+ *
+ * Creating an xdg_surface does not set the role for a wl_surface. In order
+ * to map an xdg_surface, the client must create a role-specific object
+ * using, e.g., get_toplevel, get_popup. The wl_surface for any given
+ * xdg_surface can have at most one role, and may not be assigned any role
+ * not based on xdg_surface.
+ *
+ * A role must be assigned before any other requests are made to the
+ * xdg_surface object.
+ *
+ * The client must call wl_surface.commit on the corresponding wl_surface
+ * for the xdg_surface state to take effect.
+ *
+ * Creating an xdg_surface from a wl_surface which has a buffer attached or
+ * committed is a client error, and any attempts by a client to attach or
+ * manipulate a buffer prior to the first xdg_surface.configure call must
+ * also be treated as errors.
+ *
+ * For a surface to be mapped by the compositor, the following conditions
+ * must be met: (1) the client has assigned a xdg_surface based role to the
+ * surface, (2) the client has set and committed the xdg_surface state and
+ * the role dependent state to the surface and (3) the client has committed a
+ * buffer to the surface.
+ * @section page_iface_zxdg_surface_v6_api API
+ * See @ref iface_zxdg_surface_v6.
+ */
+/**
+ * @defgroup iface_zxdg_surface_v6 The zxdg_surface_v6 interface
+ *
+ * An interface that may be implemented by a wl_surface, for
+ * implementations that provide a desktop-style user interface.
+ *
+ * It provides a base set of functionality required to construct user
+ * interface elements requiring management by the compositor, such as
+ * toplevel windows, menus, etc. The types of functionality are split into
+ * xdg_surface roles.
+ *
+ * Creating an xdg_surface does not set the role for a wl_surface. In order
+ * to map an xdg_surface, the client must create a role-specific object
+ * using, e.g., get_toplevel, get_popup. The wl_surface for any given
+ * xdg_surface can have at most one role, and may not be assigned any role
+ * not based on xdg_surface.
+ *
+ * A role must be assigned before any other requests are made to the
+ * xdg_surface object.
+ *
+ * The client must call wl_surface.commit on the corresponding wl_surface
+ * for the xdg_surface state to take effect.
+ *
+ * Creating an xdg_surface from a wl_surface which has a buffer attached or
+ * committed is a client error, and any attempts by a client to attach or
+ * manipulate a buffer prior to the first xdg_surface.configure call must
+ * also be treated as errors.
+ *
+ * For a surface to be mapped by the compositor, the following conditions
+ * must be met: (1) the client has assigned a xdg_surface based role to the
+ * surface, (2) the client has set and committed the xdg_surface state and
+ * the role dependent state to the surface and (3) the client has committed a
+ * buffer to the surface.
+ */
+extern const struct wl_interface zxdg_surface_v6_interface;
+/**
+ * @page page_iface_zxdg_toplevel_v6 zxdg_toplevel_v6
+ * @section page_iface_zxdg_toplevel_v6_desc Description
+ *
+ * This interface defines an xdg_surface role which allows a surface to,
+ * among other things, set window-like properties such as maximize,
+ * fullscreen, and minimize, set application-specific metadata like title and
+ * id, and well as trigger user interactive operations such as interactive
+ * resize and move.
+ * @section page_iface_zxdg_toplevel_v6_api API
+ * See @ref iface_zxdg_toplevel_v6.
+ */
+/**
+ * @defgroup iface_zxdg_toplevel_v6 The zxdg_toplevel_v6 interface
+ *
+ * This interface defines an xdg_surface role which allows a surface to,
+ * among other things, set window-like properties such as maximize,
+ * fullscreen, and minimize, set application-specific metadata like title and
+ * id, and well as trigger user interactive operations such as interactive
+ * resize and move.
+ */
+extern const struct wl_interface zxdg_toplevel_v6_interface;
+/**
+ * @page page_iface_zxdg_popup_v6 zxdg_popup_v6
+ * @section page_iface_zxdg_popup_v6_desc Description
+ *
+ * A popup surface is a short-lived, temporary surface. It can be used to
+ * implement for example menus, popovers, tooltips and other similar user
+ * interface concepts.
+ *
+ * A popup can be made to take an explicit grab. See xdg_popup.grab for
+ * details.
+ *
+ * When the popup is dismissed, a popup_done event will be sent out, and at
+ * the same time the surface will be unmapped. See the xdg_popup.popup_done
+ * event for details.
+ *
+ * Explicitly destroying the xdg_popup object will also dismiss the popup and
+ * unmap the surface. Clients that want to dismiss the popup when another
+ * surface of their own is clicked should dismiss the popup using the destroy
+ * request.
+ *
+ * The parent surface must have either the xdg_toplevel or xdg_popup surface
+ * role.
+ *
+ * A newly created xdg_popup will be stacked on top of all previously created
+ * xdg_popup surfaces associated with the same xdg_toplevel.
+ *
+ * The parent of an xdg_popup must be mapped (see the xdg_surface
+ * description) before the xdg_popup itself.
+ *
+ * The x and y arguments passed when creating the popup object specify
+ * where the top left of the popup should be placed, relative to the
+ * local surface coordinates of the parent surface. See
+ * xdg_surface.get_popup. An xdg_popup must intersect with or be at least
+ * partially adjacent to its parent surface.
+ *
+ * The client must call wl_surface.commit on the corresponding wl_surface
+ * for the xdg_popup state to take effect.
+ * @section page_iface_zxdg_popup_v6_api API
+ * See @ref iface_zxdg_popup_v6.
+ */
+/**
+ * @defgroup iface_zxdg_popup_v6 The zxdg_popup_v6 interface
+ *
+ * A popup surface is a short-lived, temporary surface. It can be used to
+ * implement for example menus, popovers, tooltips and other similar user
+ * interface concepts.
+ *
+ * A popup can be made to take an explicit grab. See xdg_popup.grab for
+ * details.
+ *
+ * When the popup is dismissed, a popup_done event will be sent out, and at
+ * the same time the surface will be unmapped. See the xdg_popup.popup_done
+ * event for details.
+ *
+ * Explicitly destroying the xdg_popup object will also dismiss the popup and
+ * unmap the surface. Clients that want to dismiss the popup when another
+ * surface of their own is clicked should dismiss the popup using the destroy
+ * request.
+ *
+ * The parent surface must have either the xdg_toplevel or xdg_popup surface
+ * role.
+ *
+ * A newly created xdg_popup will be stacked on top of all previously created
+ * xdg_popup surfaces associated with the same xdg_toplevel.
+ *
+ * The parent of an xdg_popup must be mapped (see the xdg_surface
+ * description) before the xdg_popup itself.
+ *
+ * The x and y arguments passed when creating the popup object specify
+ * where the top left of the popup should be placed, relative to the
+ * local surface coordinates of the parent surface. See
+ * xdg_surface.get_popup. An xdg_popup must intersect with or be at least
+ * partially adjacent to its parent surface.
+ *
+ * The client must call wl_surface.commit on the corresponding wl_surface
+ * for the xdg_popup state to take effect.
+ */
+extern const struct wl_interface zxdg_popup_v6_interface;
+
+#ifndef ZXDG_SHELL_V6_ERROR_ENUM
+#define ZXDG_SHELL_V6_ERROR_ENUM
+enum zxdg_shell_v6_error {
+  /**
+   * given wl_surface has another role
+   */
+  ZXDG_SHELL_V6_ERROR_ROLE = 0,
+  /**
+   * xdg_shell was destroyed before children
+   */
+  ZXDG_SHELL_V6_ERROR_DEFUNCT_SURFACES = 1,
+  /**
+   * the client tried to map or destroy a non-topmost popup
+   */
+  ZXDG_SHELL_V6_ERROR_NOT_THE_TOPMOST_POPUP = 2,
+  /**
+   * the client specified an invalid popup parent surface
+   */
+  ZXDG_SHELL_V6_ERROR_INVALID_POPUP_PARENT = 3,
+  /**
+   * the client provided an invalid surface state
+   */
+  ZXDG_SHELL_V6_ERROR_INVALID_SURFACE_STATE = 4,
+  /**
+   * the client provided an invalid positioner
+   */
+  ZXDG_SHELL_V6_ERROR_INVALID_POSITIONER = 5,
+};
+#endif /* ZXDG_SHELL_V6_ERROR_ENUM */
+
+/**
+ * @ingroup iface_zxdg_shell_v6
+ * @struct zxdg_shell_v6_listener
+ */
+struct zxdg_shell_v6_listener {
+  /**
+   * check if the client is alive
+   *
+   * The ping event asks the client if it's still alive. Pass the
+   * serial specified in the event back to the compositor by sending
+   * a "pong" request back with the specified serial. See
+   * xdg_shell.ping.
+   *
+   * Compositors can use this to determine if the client is still
+   * alive. It's unspecified what will happen if the client doesn't
+   * respond to the ping request, or in what timeframe. Clients
+   * should try to respond in a reasonable amount of time.
+   *
+   * A compositor is free to ping in any way it wants, but a client
+   * must always respond to any xdg_shell object it created.
+   * @param serial pass this to the pong request
+   */
+  void (*ping)(void *data,
+         struct zxdg_shell_v6 *zxdg_shell_v6,
+         uint32_t serial);
+};
+
+/**
+ * @ingroup iface_zxdg_shell_v6
+ */
+static inline int
+zxdg_shell_v6_add_listener(struct zxdg_shell_v6 *zxdg_shell_v6,
+         const struct zxdg_shell_v6_listener *listener, void *data)
+{
+  return wl_proxy_add_listener((struct wl_proxy *) zxdg_shell_v6,
+             (void (**)(void)) listener, data);
+}
+
+#define ZXDG_SHELL_V6_DESTROY 0
+#define ZXDG_SHELL_V6_CREATE_POSITIONER 1
+#define ZXDG_SHELL_V6_GET_XDG_SURFACE 2
+#define ZXDG_SHELL_V6_PONG 3
+
+/**
+ * @ingroup iface_zxdg_shell_v6
+ */
+#define ZXDG_SHELL_V6_PING_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_zxdg_shell_v6
+ */
+#define ZXDG_SHELL_V6_DESTROY_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_shell_v6
+ */
+#define ZXDG_SHELL_V6_CREATE_POSITIONER_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_shell_v6
+ */
+#define ZXDG_SHELL_V6_GET_XDG_SURFACE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_shell_v6
+ */
+#define ZXDG_SHELL_V6_PONG_SINCE_VERSION 1
+
+/** @ingroup iface_zxdg_shell_v6 */
+static inline void
+zxdg_shell_v6_set_user_data(struct zxdg_shell_v6 *zxdg_shell_v6, void *user_data)
+{
+  wl_proxy_set_user_data((struct wl_proxy *) zxdg_shell_v6, user_data);
+}
+
+/** @ingroup iface_zxdg_shell_v6 */
+static inline void *
+zxdg_shell_v6_get_user_data(struct zxdg_shell_v6 *zxdg_shell_v6)
+{
+  return wl_proxy_get_user_data((struct wl_proxy *) zxdg_shell_v6);
+}
+
+static inline uint32_t
+zxdg_shell_v6_get_version(struct zxdg_shell_v6 *zxdg_shell_v6)
+{
+  return wl_proxy_get_version((struct wl_proxy *) zxdg_shell_v6);
+}
+
+/**
+ * @ingroup iface_zxdg_shell_v6
+ *
+ * Destroy this xdg_shell object.
+ *
+ * Destroying a bound xdg_shell object while there are surfaces
+ * still alive created by this xdg_shell object instance is illegal
+ * and will result in a protocol error.
+ */
+static inline void
+zxdg_shell_v6_destroy(struct zxdg_shell_v6 *zxdg_shell_v6)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_shell_v6,
+       ZXDG_SHELL_V6_DESTROY);
+
+  wl_proxy_destroy((struct wl_proxy *) zxdg_shell_v6);
+}
+
+/**
+ * @ingroup iface_zxdg_shell_v6
+ *
+ * Create a positioner object. A positioner object is used to position
+ * surfaces relative to some parent surface. See the interface description
+ * and xdg_surface.get_popup for details.
+ */
+static inline struct zxdg_positioner_v6 *
+zxdg_shell_v6_create_positioner(struct zxdg_shell_v6 *zxdg_shell_v6)
+{
+  struct wl_proxy *id;
+
+  id = wl_proxy_marshal_constructor((struct wl_proxy *) zxdg_shell_v6,
+       ZXDG_SHELL_V6_CREATE_POSITIONER, &zxdg_positioner_v6_interface, NULL);
+
+  return (struct zxdg_positioner_v6 *) id;
+}
+
+/**
+ * @ingroup iface_zxdg_shell_v6
+ *
+ * This creates an xdg_surface for the given surface. While xdg_surface
+ * itself is not a role, the corresponding surface may only be assigned
+ * a role extending xdg_surface, such as xdg_toplevel or xdg_popup.
+ *
+ * This creates an xdg_surface for the given surface. An xdg_surface is
+ * used as basis to define a role to a given surface, such as xdg_toplevel
+ * or xdg_popup. It also manages functionality shared between xdg_surface
+ * based surface roles.
+ *
+ * See the documentation of xdg_surface for more details about what an
+ * xdg_surface is and how it is used.
+ */
+static inline struct zxdg_surface_v6 *
+zxdg_shell_v6_get_xdg_surface(struct zxdg_shell_v6 *zxdg_shell_v6, struct wl_surface *surface)
+{
+  struct wl_proxy *id;
+
+  id = wl_proxy_marshal_constructor((struct wl_proxy *) zxdg_shell_v6,
+       ZXDG_SHELL_V6_GET_XDG_SURFACE, &zxdg_surface_v6_interface, NULL, surface);
+
+  return (struct zxdg_surface_v6 *) id;
+}
+
+/**
+ * @ingroup iface_zxdg_shell_v6
+ *
+ * A client must respond to a ping event with a pong request or
+ * the client may be deemed unresponsive. See xdg_shell.ping.
+ */
+static inline void
+zxdg_shell_v6_pong(struct zxdg_shell_v6 *zxdg_shell_v6, uint32_t serial)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_shell_v6,
+       ZXDG_SHELL_V6_PONG, serial);
+}
+
+#ifndef ZXDG_POSITIONER_V6_ERROR_ENUM
+#define ZXDG_POSITIONER_V6_ERROR_ENUM
+enum zxdg_positioner_v6_error {
+  /**
+   * invalid input provided
+   */
+  ZXDG_POSITIONER_V6_ERROR_INVALID_INPUT = 0,
+};
+#endif /* ZXDG_POSITIONER_V6_ERROR_ENUM */
+
+#ifndef ZXDG_POSITIONER_V6_ANCHOR_ENUM
+#define ZXDG_POSITIONER_V6_ANCHOR_ENUM
+enum zxdg_positioner_v6_anchor {
+  /**
+   * the center of the anchor rectangle
+   */
+  ZXDG_POSITIONER_V6_ANCHOR_NONE = 0,
+  /**
+   * the top edge of the anchor rectangle
+   */
+  ZXDG_POSITIONER_V6_ANCHOR_TOP = 1,
+  /**
+   * the bottom edge of the anchor rectangle
+   */
+  ZXDG_POSITIONER_V6_ANCHOR_BOTTOM = 2,
+  /**
+   * the left edge of the anchor rectangle
+   */
+  ZXDG_POSITIONER_V6_ANCHOR_LEFT = 4,
+  /**
+   * the right edge of the anchor rectangle
+   */
+  ZXDG_POSITIONER_V6_ANCHOR_RIGHT = 8,
+};
+#endif /* ZXDG_POSITIONER_V6_ANCHOR_ENUM */
+
+#ifndef ZXDG_POSITIONER_V6_GRAVITY_ENUM
+#define ZXDG_POSITIONER_V6_GRAVITY_ENUM
+enum zxdg_positioner_v6_gravity {
+  /**
+   * center over the anchor edge
+   */
+  ZXDG_POSITIONER_V6_GRAVITY_NONE = 0,
+  /**
+   * position above the anchor edge
+   */
+  ZXDG_POSITIONER_V6_GRAVITY_TOP = 1,
+  /**
+   * position below the anchor edge
+   */
+  ZXDG_POSITIONER_V6_GRAVITY_BOTTOM = 2,
+  /**
+   * position to the left of the anchor edge
+   */
+  ZXDG_POSITIONER_V6_GRAVITY_LEFT = 4,
+  /**
+   * position to the right of the anchor edge
+   */
+  ZXDG_POSITIONER_V6_GRAVITY_RIGHT = 8,
+};
+#endif /* ZXDG_POSITIONER_V6_GRAVITY_ENUM */
+
+#ifndef ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_ENUM
+#define ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_ENUM
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ * vertically resize the surface
+ *
+ * Resize the surface vertically so that it is completely unconstrained.
+ */
+enum zxdg_positioner_v6_constraint_adjustment {
+  ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_NONE = 0,
+  ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_X = 1,
+  ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_Y = 2,
+  ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_FLIP_X = 4,
+  ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_FLIP_Y = 8,
+  ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_X = 16,
+  ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_Y = 32,
+};
+#endif /* ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_ENUM */
+
+#define ZXDG_POSITIONER_V6_DESTROY 0
+#define ZXDG_POSITIONER_V6_SET_SIZE 1
+#define ZXDG_POSITIONER_V6_SET_ANCHOR_RECT 2
+#define ZXDG_POSITIONER_V6_SET_ANCHOR 3
+#define ZXDG_POSITIONER_V6_SET_GRAVITY 4
+#define ZXDG_POSITIONER_V6_SET_CONSTRAINT_ADJUSTMENT 5
+#define ZXDG_POSITIONER_V6_SET_OFFSET 6
+
+
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ */
+#define ZXDG_POSITIONER_V6_DESTROY_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ */
+#define ZXDG_POSITIONER_V6_SET_SIZE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ */
+#define ZXDG_POSITIONER_V6_SET_ANCHOR_RECT_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ */
+#define ZXDG_POSITIONER_V6_SET_ANCHOR_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ */
+#define ZXDG_POSITIONER_V6_SET_GRAVITY_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ */
+#define ZXDG_POSITIONER_V6_SET_CONSTRAINT_ADJUSTMENT_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ */
+#define ZXDG_POSITIONER_V6_SET_OFFSET_SINCE_VERSION 1
+
+/** @ingroup iface_zxdg_positioner_v6 */
+static inline void
+zxdg_positioner_v6_set_user_data(struct zxdg_positioner_v6 *zxdg_positioner_v6, void *user_data)
+{
+  wl_proxy_set_user_data((struct wl_proxy *) zxdg_positioner_v6, user_data);
+}
+
+/** @ingroup iface_zxdg_positioner_v6 */
+static inline void *
+zxdg_positioner_v6_get_user_data(struct zxdg_positioner_v6 *zxdg_positioner_v6)
+{
+  return wl_proxy_get_user_data((struct wl_proxy *) zxdg_positioner_v6);
+}
+
+static inline uint32_t
+zxdg_positioner_v6_get_version(struct zxdg_positioner_v6 *zxdg_positioner_v6)
+{
+  return wl_proxy_get_version((struct wl_proxy *) zxdg_positioner_v6);
+}
+
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ *
+ * Notify the compositor that the xdg_positioner will no longer be used.
+ */
+static inline void
+zxdg_positioner_v6_destroy(struct zxdg_positioner_v6 *zxdg_positioner_v6)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_positioner_v6,
+       ZXDG_POSITIONER_V6_DESTROY);
+
+  wl_proxy_destroy((struct wl_proxy *) zxdg_positioner_v6);
+}
+
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ *
+ * Set the size of the surface that is to be positioned with the positioner
+ * object. The size is in surface-local coordinates and corresponds to the
+ * window geometry. See xdg_surface.set_window_geometry.
+ *
+ * If a zero or negative size is set the invalid_input error is raised.
+ */
+static inline void
+zxdg_positioner_v6_set_size(struct zxdg_positioner_v6 *zxdg_positioner_v6, int32_t width, int32_t height)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_positioner_v6,
+       ZXDG_POSITIONER_V6_SET_SIZE, width, height);
+}
+
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ *
+ * Specify the anchor rectangle within the parent surface that the child
+ * surface will be placed relative to. The rectangle is relative to the
+ * window geometry as defined by xdg_surface.set_window_geometry of the
+ * parent surface. The rectangle must be at least 1x1 large.
+ *
+ * When the xdg_positioner object is used to position a child surface, the
+ * anchor rectangle may not extend outside the window geometry of the
+ * positioned child's parent surface.
+ *
+ * If a zero or negative size is set the invalid_input error is raised.
+ */
+static inline void
+zxdg_positioner_v6_set_anchor_rect(struct zxdg_positioner_v6 *zxdg_positioner_v6, int32_t x, int32_t y, int32_t width, int32_t height)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_positioner_v6,
+       ZXDG_POSITIONER_V6_SET_ANCHOR_RECT, x, y, width, height);
+}
+
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ *
+ * Defines a set of edges for the anchor rectangle. These are used to
+ * derive an anchor point that the child surface will be positioned
+ * relative to. If two orthogonal edges are specified (e.g. 'top' and
+ * 'left'), then the anchor point will be the intersection of the edges
+ * (e.g. the top left position of the rectangle); otherwise, the derived
+ * anchor point will be centered on the specified edge, or in the center of
+ * the anchor rectangle if no edge is specified.
+ *
+ * If two parallel anchor edges are specified (e.g. 'left' and 'right'),
+ * the invalid_input error is raised.
+ */
+static inline void
+zxdg_positioner_v6_set_anchor(struct zxdg_positioner_v6 *zxdg_positioner_v6, uint32_t anchor)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_positioner_v6,
+       ZXDG_POSITIONER_V6_SET_ANCHOR, anchor);
+}
+
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ *
+ * Defines in what direction a surface should be positioned, relative to
+ * the anchor point of the parent surface. If two orthogonal gravities are
+ * specified (e.g. 'bottom' and 'right'), then the child surface will be
+ * placed in the specified direction; otherwise, the child surface will be
+ * centered over the anchor point on any axis that had no gravity
+ * specified.
+ *
+ * If two parallel gravities are specified (e.g. 'left' and 'right'), the
+ * invalid_input error is raised.
+ */
+static inline void
+zxdg_positioner_v6_set_gravity(struct zxdg_positioner_v6 *zxdg_positioner_v6, uint32_t gravity)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_positioner_v6,
+       ZXDG_POSITIONER_V6_SET_GRAVITY, gravity);
+}
+
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ *
+ * Specify how the window should be positioned if the originally intended
+ * position caused the surface to be constrained, meaning at least
+ * partially outside positioning boundaries set by the compositor. The
+ * adjustment is set by constructing a bitmask describing the adjustment to
+ * be made when the surface is constrained on that axis.
+ *
+ * If no bit for one axis is set, the compositor will assume that the child
+ * surface should not change its position on that axis when constrained.
+ *
+ * If more than one bit for one axis is set, the order of how adjustments
+ * are applied is specified in the corresponding adjustment descriptions.
+ *
+ * The default adjustment is none.
+ */
+static inline void
+zxdg_positioner_v6_set_constraint_adjustment(struct zxdg_positioner_v6 *zxdg_positioner_v6, uint32_t constraint_adjustment)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_positioner_v6,
+       ZXDG_POSITIONER_V6_SET_CONSTRAINT_ADJUSTMENT, constraint_adjustment);
+}
+
+/**
+ * @ingroup iface_zxdg_positioner_v6
+ *
+ * Specify the surface position offset relative to the position of the
+ * anchor on the anchor rectangle and the anchor on the surface. For
+ * example if the anchor of the anchor rectangle is at (x, y), the surface
+ * has the gravity bottom|right, and the offset is (ox, oy), the calculated
+ * surface position will be (x + ox, y + oy). The offset position of the
+ * surface is the one used for constraint testing. See
+ * set_constraint_adjustment.
+ *
+ * An example use case is placing a popup menu on top of a user interface
+ * element, while aligning the user interface element of the parent surface
+ * with some user interface element placed somewhere in the popup surface.
+ */
+static inline void
+zxdg_positioner_v6_set_offset(struct zxdg_positioner_v6 *zxdg_positioner_v6, int32_t x, int32_t y)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_positioner_v6,
+       ZXDG_POSITIONER_V6_SET_OFFSET, x, y);
+}
+
+#ifndef ZXDG_SURFACE_V6_ERROR_ENUM
+#define ZXDG_SURFACE_V6_ERROR_ENUM
+enum zxdg_surface_v6_error {
+  ZXDG_SURFACE_V6_ERROR_NOT_CONSTRUCTED = 1,
+  ZXDG_SURFACE_V6_ERROR_ALREADY_CONSTRUCTED = 2,
+  ZXDG_SURFACE_V6_ERROR_UNCONFIGURED_BUFFER = 3,
+};
+#endif /* ZXDG_SURFACE_V6_ERROR_ENUM */
+
+/**
+ * @ingroup iface_zxdg_surface_v6
+ * @struct zxdg_surface_v6_listener
+ */
+struct zxdg_surface_v6_listener {
+  /**
+   * suggest a surface change
+   *
+   * The configure event marks the end of a configure sequence. A
+   * configure sequence is a set of one or more events configuring
+   * the state of the xdg_surface, including the final
+   * xdg_surface.configure event.
+   *
+   * Where applicable, xdg_surface surface roles will during a
+   * configure sequence extend this event as a latched state sent as
+   * events before the xdg_surface.configure event. Such events
+   * should be considered to make up a set of atomically applied
+   * configuration states, where the xdg_surface.configure commits
+   * the accumulated state.
+   *
+   * Clients should arrange their surface for the new states, and
+   * then send an ack_configure request with the serial sent in this
+   * configure event at some point before committing the new surface.
+   *
+   * If the client receives multiple configure events before it can
+   * respond to one, it is free to discard all but the last event it
+   * received.
+   * @param serial serial of the configure event
+   */
+  void (*configure)(void *data,
+        struct zxdg_surface_v6 *zxdg_surface_v6,
+        uint32_t serial);
+};
+
+/**
+ * @ingroup iface_zxdg_surface_v6
+ */
+static inline int
+zxdg_surface_v6_add_listener(struct zxdg_surface_v6 *zxdg_surface_v6,
+           const struct zxdg_surface_v6_listener *listener, void *data)
+{
+  return wl_proxy_add_listener((struct wl_proxy *) zxdg_surface_v6,
+             (void (**)(void)) listener, data);
+}
+
+#define ZXDG_SURFACE_V6_DESTROY 0
+#define ZXDG_SURFACE_V6_GET_TOPLEVEL 1
+#define ZXDG_SURFACE_V6_GET_POPUP 2
+#define ZXDG_SURFACE_V6_SET_WINDOW_GEOMETRY 3
+#define ZXDG_SURFACE_V6_ACK_CONFIGURE 4
+
+/**
+ * @ingroup iface_zxdg_surface_v6
+ */
+#define ZXDG_SURFACE_V6_CONFIGURE_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_zxdg_surface_v6
+ */
+#define ZXDG_SURFACE_V6_DESTROY_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_surface_v6
+ */
+#define ZXDG_SURFACE_V6_GET_TOPLEVEL_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_surface_v6
+ */
+#define ZXDG_SURFACE_V6_GET_POPUP_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_surface_v6
+ */
+#define ZXDG_SURFACE_V6_SET_WINDOW_GEOMETRY_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_surface_v6
+ */
+#define ZXDG_SURFACE_V6_ACK_CONFIGURE_SINCE_VERSION 1
+
+/** @ingroup iface_zxdg_surface_v6 */
+static inline void
+zxdg_surface_v6_set_user_data(struct zxdg_surface_v6 *zxdg_surface_v6, void *user_data)
+{
+  wl_proxy_set_user_data((struct wl_proxy *) zxdg_surface_v6, user_data);
+}
+
+/** @ingroup iface_zxdg_surface_v6 */
+static inline void *
+zxdg_surface_v6_get_user_data(struct zxdg_surface_v6 *zxdg_surface_v6)
+{
+  return wl_proxy_get_user_data((struct wl_proxy *) zxdg_surface_v6);
+}
+
+static inline uint32_t
+zxdg_surface_v6_get_version(struct zxdg_surface_v6 *zxdg_surface_v6)
+{
+  return wl_proxy_get_version((struct wl_proxy *) zxdg_surface_v6);
+}
+
+/**
+ * @ingroup iface_zxdg_surface_v6
+ *
+ * Destroy the xdg_surface object. An xdg_surface must only be destroyed
+ * after its role object has been destroyed.
+ */
+static inline void
+zxdg_surface_v6_destroy(struct zxdg_surface_v6 *zxdg_surface_v6)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_surface_v6,
+       ZXDG_SURFACE_V6_DESTROY);
+
+  wl_proxy_destroy((struct wl_proxy *) zxdg_surface_v6);
+}
+
+/**
+ * @ingroup iface_zxdg_surface_v6
+ *
+ * This creates an xdg_toplevel object for the given xdg_surface and gives
+ * the associated wl_surface the xdg_toplevel role.
+ *
+ * See the documentation of xdg_toplevel for more details about what an
+ * xdg_toplevel is and how it is used.
+ */
+static inline struct zxdg_toplevel_v6 *
+zxdg_surface_v6_get_toplevel(struct zxdg_surface_v6 *zxdg_surface_v6)
+{
+  struct wl_proxy *id;
+
+  id = wl_proxy_marshal_constructor((struct wl_proxy *) zxdg_surface_v6,
+       ZXDG_SURFACE_V6_GET_TOPLEVEL, &zxdg_toplevel_v6_interface, NULL);
+
+  return (struct zxdg_toplevel_v6 *) id;
+}
+
+/**
+ * @ingroup iface_zxdg_surface_v6
+ *
+ * This creates an xdg_popup object for the given xdg_surface and gives the
+ * associated wl_surface the xdg_popup role.
+ *
+ * See the documentation of xdg_popup for more details about what an
+ * xdg_popup is and how it is used.
+ */
+static inline struct zxdg_popup_v6 *
+zxdg_surface_v6_get_popup(struct zxdg_surface_v6 *zxdg_surface_v6, struct zxdg_surface_v6 *parent, struct zxdg_positioner_v6 *positioner)
+{
+  struct wl_proxy *id;
+
+  id = wl_proxy_marshal_constructor((struct wl_proxy *) zxdg_surface_v6,
+       ZXDG_SURFACE_V6_GET_POPUP, &zxdg_popup_v6_interface, NULL, parent, positioner);
+
+  return (struct zxdg_popup_v6 *) id;
+}
+
+/**
+ * @ingroup iface_zxdg_surface_v6
+ *
+ * The window geometry of a surface is its "visible bounds" from the
+ * user's perspective. Client-side decorations often have invisible
+ * portions like drop-shadows which should be ignored for the
+ * purposes of aligning, placing and constraining windows.
+ *
+ * The window geometry is double buffered, and will be applied at the
+ * time wl_surface.commit of the corresponding wl_surface is called.
+ *
+ * Once the window geometry of the surface is set, it is not possible to
+ * unset it, and it will remain the same until set_window_geometry is
+ * called again, even if a new subsurface or buffer is attached.
+ *
+ * If never set, the value is the full bounds of the surface,
+ * including any subsurfaces. This updates dynamically on every
+ * commit. This unset is meant for extremely simple clients.
+ *
+ * The arguments are given in the surface-local coordinate space of
+ * the wl_surface associated with this xdg_surface.
+ *
+ * The width and height must be greater than zero. Setting an invalid size
+ * will raise an error. When applied, the effective window geometry will be
+ * the set window geometry clamped to the bounding rectangle of the
+ * combined geometry of the surface of the xdg_surface and the associated
+ * subsurfaces.
+ */
+static inline void
+zxdg_surface_v6_set_window_geometry(struct zxdg_surface_v6 *zxdg_surface_v6, int32_t x, int32_t y, int32_t width, int32_t height)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_surface_v6,
+       ZXDG_SURFACE_V6_SET_WINDOW_GEOMETRY, x, y, width, height);
+}
+
+/**
+ * @ingroup iface_zxdg_surface_v6
+ *
+ * When a configure event is received, if a client commits the
+ * surface in response to the configure event, then the client
+ * must make an ack_configure request sometime before the commit
+ * request, passing along the serial of the configure event.
+ *
+ * For instance, for toplevel surfaces the compositor might use this
+ * information to move a surface to the top left only when the client has
+ * drawn itself for the maximized or fullscreen state.
+ *
+ * If the client receives multiple configure events before it
+ * can respond to one, it only has to ack the last configure event.
+ *
+ * A client is not required to commit immediately after sending
+ * an ack_configure request - it may even ack_configure several times
+ * before its next surface commit.
+ *
+ * A client may send multiple ack_configure requests before committing, but
+ * only the last request sent before a commit indicates which configure
+ * event the client really is responding to.
+ */
+static inline void
+zxdg_surface_v6_ack_configure(struct zxdg_surface_v6 *zxdg_surface_v6, uint32_t serial)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_surface_v6,
+       ZXDG_SURFACE_V6_ACK_CONFIGURE, serial);
+}
+
+#ifndef ZXDG_TOPLEVEL_V6_RESIZE_EDGE_ENUM
+#define ZXDG_TOPLEVEL_V6_RESIZE_EDGE_ENUM
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ * edge values for resizing
+ *
+ * These values are used to indicate which edge of a surface
+ * is being dragged in a resize operation.
+ */
+enum zxdg_toplevel_v6_resize_edge {
+  ZXDG_TOPLEVEL_V6_RESIZE_EDGE_NONE = 0,
+  ZXDG_TOPLEVEL_V6_RESIZE_EDGE_TOP = 1,
+  ZXDG_TOPLEVEL_V6_RESIZE_EDGE_BOTTOM = 2,
+  ZXDG_TOPLEVEL_V6_RESIZE_EDGE_LEFT = 4,
+  ZXDG_TOPLEVEL_V6_RESIZE_EDGE_TOP_LEFT = 5,
+  ZXDG_TOPLEVEL_V6_RESIZE_EDGE_BOTTOM_LEFT = 6,
+  ZXDG_TOPLEVEL_V6_RESIZE_EDGE_RIGHT = 8,
+  ZXDG_TOPLEVEL_V6_RESIZE_EDGE_TOP_RIGHT = 9,
+  ZXDG_TOPLEVEL_V6_RESIZE_EDGE_BOTTOM_RIGHT = 10,
+};
+#endif /* ZXDG_TOPLEVEL_V6_RESIZE_EDGE_ENUM */
+
+#ifndef ZXDG_TOPLEVEL_V6_STATE_ENUM
+#define ZXDG_TOPLEVEL_V6_STATE_ENUM
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ * the surface is now activated
+ *
+ * Client window decorations should be painted as if the window is
+ * active. Do not assume this means that the window actually has
+ * keyboard or pointer focus.
+ */
+enum zxdg_toplevel_v6_state {
+  /**
+   * the surface is maximized
+   */
+  ZXDG_TOPLEVEL_V6_STATE_MAXIMIZED = 1,
+  /**
+   * the surface is fullscreen
+   */
+  ZXDG_TOPLEVEL_V6_STATE_FULLSCREEN = 2,
+  /**
+   * the surface is being resized
+   */
+  ZXDG_TOPLEVEL_V6_STATE_RESIZING = 3,
+  /**
+   * the surface is now activated
+   */
+  ZXDG_TOPLEVEL_V6_STATE_ACTIVATED = 4,
+};
+#endif /* ZXDG_TOPLEVEL_V6_STATE_ENUM */
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ * @struct zxdg_toplevel_v6_listener
+ */
+struct zxdg_toplevel_v6_listener {
+  /**
+   * suggest a surface change
+   *
+   * This configure event asks the client to resize its toplevel
+   * surface or to change its state. The configured state should not
+   * be applied immediately. See xdg_surface.configure for details.
+   *
+   * The width and height arguments specify a hint to the window
+   * about how its surface should be resized in window geometry
+   * coordinates. See set_window_geometry.
+   *
+   * If the width or height arguments are zero, it means the client
+   * should decide its own window dimension. This may happen when the
+   * compositor needs to configure the state of the surface but
+   * doesn't have any information about any previous or expected
+   * dimension.
+   *
+   * The states listed in the event specify how the width/height
+   * arguments should be interpreted, and possibly how it should be
+   * drawn.
+   *
+   * Clients must send an ack_configure in response to this event.
+   * See xdg_surface.configure and xdg_surface.ack_configure for
+   * details.
+   */
+  void (*configure)(void *data,
+        struct zxdg_toplevel_v6 *zxdg_toplevel_v6,
+        int32_t width,
+        int32_t height,
+        struct wl_array *states);
+  /**
+   * surface wants to be closed
+   *
+   * The close event is sent by the compositor when the user wants
+   * the surface to be closed. This should be equivalent to the user
+   * clicking the close button in client-side decorations, if your
+   * application has any.
+   *
+   * This is only a request that the user intends to close the
+   * window. The client may choose to ignore this request, or show a
+   * dialog to ask the user to save their data, etc.
+   */
+  void (*close)(void *data,
+          struct zxdg_toplevel_v6 *zxdg_toplevel_v6);
+};
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+static inline int
+zxdg_toplevel_v6_add_listener(struct zxdg_toplevel_v6 *zxdg_toplevel_v6,
+            const struct zxdg_toplevel_v6_listener *listener, void *data)
+{
+  return wl_proxy_add_listener((struct wl_proxy *) zxdg_toplevel_v6,
+             (void (**)(void)) listener, data);
+}
+
+#define ZXDG_TOPLEVEL_V6_DESTROY 0
+#define ZXDG_TOPLEVEL_V6_SET_PARENT 1
+#define ZXDG_TOPLEVEL_V6_SET_TITLE 2
+#define ZXDG_TOPLEVEL_V6_SET_APP_ID 3
+#define ZXDG_TOPLEVEL_V6_SHOW_WINDOW_MENU 4
+#define ZXDG_TOPLEVEL_V6_MOVE 5
+#define ZXDG_TOPLEVEL_V6_RESIZE 6
+#define ZXDG_TOPLEVEL_V6_SET_MAX_SIZE 7
+#define ZXDG_TOPLEVEL_V6_SET_MIN_SIZE 8
+#define ZXDG_TOPLEVEL_V6_SET_MAXIMIZED 9
+#define ZXDG_TOPLEVEL_V6_UNSET_MAXIMIZED 10
+#define ZXDG_TOPLEVEL_V6_SET_FULLSCREEN 11
+#define ZXDG_TOPLEVEL_V6_UNSET_FULLSCREEN 12
+#define ZXDG_TOPLEVEL_V6_SET_MINIMIZED 13
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_CONFIGURE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_CLOSE_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_DESTROY_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_SET_PARENT_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_SET_TITLE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_SET_APP_ID_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_SHOW_WINDOW_MENU_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_MOVE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_RESIZE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_SET_MAX_SIZE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_SET_MIN_SIZE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_SET_MAXIMIZED_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_UNSET_MAXIMIZED_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_SET_FULLSCREEN_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_UNSET_FULLSCREEN_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+#define ZXDG_TOPLEVEL_V6_SET_MINIMIZED_SINCE_VERSION 1
+
+/** @ingroup iface_zxdg_toplevel_v6 */
+static inline void
+zxdg_toplevel_v6_set_user_data(struct zxdg_toplevel_v6 *zxdg_toplevel_v6, void *user_data)
+{
+  wl_proxy_set_user_data((struct wl_proxy *) zxdg_toplevel_v6, user_data);
+}
+
+/** @ingroup iface_zxdg_toplevel_v6 */
+static inline void *
+zxdg_toplevel_v6_get_user_data(struct zxdg_toplevel_v6 *zxdg_toplevel_v6)
+{
+  return wl_proxy_get_user_data((struct wl_proxy *) zxdg_toplevel_v6);
+}
+
+static inline uint32_t
+zxdg_toplevel_v6_get_version(struct zxdg_toplevel_v6 *zxdg_toplevel_v6)
+{
+  return wl_proxy_get_version((struct wl_proxy *) zxdg_toplevel_v6);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Unmap and destroy the window. The window will be effectively
+ * hidden from the user's point of view, and all state like
+ * maximization, fullscreen, and so on, will be lost.
+ */
+static inline void
+zxdg_toplevel_v6_destroy(struct zxdg_toplevel_v6 *zxdg_toplevel_v6)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_DESTROY);
+
+  wl_proxy_destroy((struct wl_proxy *) zxdg_toplevel_v6);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Set the "parent" of this surface. This window should be stacked
+ * above a parent. The parent surface must be mapped as long as this
+ * surface is mapped.
+ *
+ * Parent windows should be set on dialogs, toolboxes, or other
+ * "auxiliary" surfaces, so that the parent is raised when the dialog
+ * is raised.
+ */
+static inline void
+zxdg_toplevel_v6_set_parent(struct zxdg_toplevel_v6 *zxdg_toplevel_v6, struct zxdg_toplevel_v6 *parent)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_SET_PARENT, parent);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Set a short title for the surface.
+ *
+ * This string may be used to identify the surface in a task bar,
+ * window list, or other user interface elements provided by the
+ * compositor.
+ *
+ * The string must be encoded in UTF-8.
+ */
+static inline void
+zxdg_toplevel_v6_set_title(struct zxdg_toplevel_v6 *zxdg_toplevel_v6, const char *title)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_SET_TITLE, title);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Set an application identifier for the surface.
+ *
+ * The app ID identifies the general class of applications to which
+ * the surface belongs. The compositor can use this to group multiple
+ * surfaces together, or to determine how to launch a new application.
+ *
+ * For D-Bus activatable applications, the app ID is used as the D-Bus
+ * service name.
+ *
+ * The compositor shell will try to group application surfaces together
+ * by their app ID. As a best practice, it is suggested to select app
+ * ID's that match the basename of the application's .desktop file.
+ * For example, "org.freedesktop.FooViewer" where the .desktop file is
+ * "org.freedesktop.FooViewer.desktop".
+ *
+ * See the desktop-entry specification [0] for more details on
+ * application identifiers and how they relate to well-known D-Bus
+ * names and .desktop files.
+ *
+ * [0] http://standards.freedesktop.org/desktop-entry-spec/
+ */
+static inline void
+zxdg_toplevel_v6_set_app_id(struct zxdg_toplevel_v6 *zxdg_toplevel_v6, const char *app_id)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_SET_APP_ID, app_id);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Clients implementing client-side decorations might want to show
+ * a context menu when right-clicking on the decorations, giving the
+ * user a menu that they can use to maximize or minimize the window.
+ *
+ * This request asks the compositor to pop up such a window menu at
+ * the given position, relative to the local surface coordinates of
+ * the parent surface. There are no guarantees as to what menu items
+ * the window menu contains.
+ *
+ * This request must be used in response to some sort of user action
+ * like a button press, key press, or touch down event.
+ */
+static inline void
+zxdg_toplevel_v6_show_window_menu(struct zxdg_toplevel_v6 *zxdg_toplevel_v6, struct wl_seat *seat, uint32_t serial, int32_t x, int32_t y)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_SHOW_WINDOW_MENU, seat, serial, x, y);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Start an interactive, user-driven move of the surface.
+ *
+ * This request must be used in response to some sort of user action
+ * like a button press, key press, or touch down event. The passed
+ * serial is used to determine the type of interactive move (touch,
+ * pointer, etc).
+ *
+ * The server may ignore move requests depending on the state of
+ * the surface (e.g. fullscreen or maximized), or if the passed serial
+ * is no longer valid.
+ *
+ * If triggered, the surface will lose the focus of the device
+ * (wl_pointer, wl_touch, etc) used for the move. It is up to the
+ * compositor to visually indicate that the move is taking place, such as
+ * updating a pointer cursor, during the move. There is no guarantee
+ * that the device focus will return when the move is completed.
+ */
+static inline void
+zxdg_toplevel_v6_move(struct zxdg_toplevel_v6 *zxdg_toplevel_v6, struct wl_seat *seat, uint32_t serial)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_MOVE, seat, serial);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Start a user-driven, interactive resize of the surface.
+ *
+ * This request must be used in response to some sort of user action
+ * like a button press, key press, or touch down event. The passed
+ * serial is used to determine the type of interactive resize (touch,
+ * pointer, etc).
+ *
+ * The server may ignore resize requests depending on the state of
+ * the surface (e.g. fullscreen or maximized).
+ *
+ * If triggered, the client will receive configure events with the
+ * "resize" state enum value and the expected sizes. See the "resize"
+ * enum value for more details about what is required. The client
+ * must also acknowledge configure events using "ack_configure". After
+ * the resize is completed, the client will receive another "configure"
+ * event without the resize state.
+ *
+ * If triggered, the surface also will lose the focus of the device
+ * (wl_pointer, wl_touch, etc) used for the resize. It is up to the
+ * compositor to visually indicate that the resize is taking place,
+ * such as updating a pointer cursor, during the resize. There is no
+ * guarantee that the device focus will return when the resize is
+ * completed.
+ *
+ * The edges parameter specifies how the surface should be resized,
+ * and is one of the values of the resize_edge enum. The compositor
+ * may use this information to update the surface position for
+ * example when dragging the top left corner. The compositor may also
+ * use this information to adapt its behavior, e.g. choose an
+ * appropriate cursor image.
+ */
+static inline void
+zxdg_toplevel_v6_resize(struct zxdg_toplevel_v6 *zxdg_toplevel_v6, struct wl_seat *seat, uint32_t serial, uint32_t edges)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_RESIZE, seat, serial, edges);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Set a maximum size for the window.
+ *
+ * The client can specify a maximum size so that the compositor does
+ * not try to configure the window beyond this size.
+ *
+ * The width and height arguments are in window geometry coordinates.
+ * See xdg_surface.set_window_geometry.
+ *
+ * Values set in this way are double-buffered. They will get applied
+ * on the next commit.
+ *
+ * The compositor can use this information to allow or disallow
+ * different states like maximize or fullscreen and draw accurate
+ * animations.
+ *
+ * Similarly, a tiling window manager may use this information to
+ * place and resize client windows in a more effective way.
+ *
+ * The client should not rely on the compositor to obey the maximum
+ * size. The compositor may decide to ignore the values set by the
+ * client and request a larger size.
+ *
+ * If never set, or a value of zero in the request, means that the
+ * client has no expected maximum size in the given dimension.
+ * As a result, a client wishing to reset the maximum size
+ * to an unspecified state can use zero for width and height in the
+ * request.
+ *
+ * Requesting a maximum size to be smaller than the minimum size of
+ * a surface is illegal and will result in a protocol error.
+ *
+ * The width and height must be greater than or equal to zero. Using
+ * strictly negative values for width and height will result in a
+ * protocol error.
+ */
+static inline void
+zxdg_toplevel_v6_set_max_size(struct zxdg_toplevel_v6 *zxdg_toplevel_v6, int32_t width, int32_t height)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_SET_MAX_SIZE, width, height);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Set a minimum size for the window.
+ *
+ * The client can specify a minimum size so that the compositor does
+ * not try to configure the window below this size.
+ *
+ * The width and height arguments are in window geometry coordinates.
+ * See xdg_surface.set_window_geometry.
+ *
+ * Values set in this way are double-buffered. They will get applied
+ * on the next commit.
+ *
+ * The compositor can use this information to allow or disallow
+ * different states like maximize or fullscreen and draw accurate
+ * animations.
+ *
+ * Similarly, a tiling window manager may use this information to
+ * place and resize client windows in a more effective way.
+ *
+ * The client should not rely on the compositor to obey the minimum
+ * size. The compositor may decide to ignore the values set by the
+ * client and request a smaller size.
+ *
+ * If never set, or a value of zero in the request, means that the
+ * client has no expected minimum size in the given dimension.
+ * As a result, a client wishing to reset the minimum size
+ * to an unspecified state can use zero for width and height in the
+ * request.
+ *
+ * Requesting a minimum size to be larger than the maximum size of
+ * a surface is illegal and will result in a protocol error.
+ *
+ * The width and height must be greater than or equal to zero. Using
+ * strictly negative values for width and height will result in a
+ * protocol error.
+ */
+static inline void
+zxdg_toplevel_v6_set_min_size(struct zxdg_toplevel_v6 *zxdg_toplevel_v6, int32_t width, int32_t height)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_SET_MIN_SIZE, width, height);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Maximize the surface.
+ *
+ * After requesting that the surface should be maximized, the compositor
+ * will respond by emitting a configure event with the "maximized" state
+ * and the required window geometry. The client should then update its
+ * content, drawing it in a maximized state, i.e. without shadow or other
+ * decoration outside of the window geometry. The client must also
+ * acknowledge the configure when committing the new content (see
+ * ack_configure).
+ *
+ * It is up to the compositor to decide how and where to maximize the
+ * surface, for example which output and what region of the screen should
+ * be used.
+ *
+ * If the surface was already maximized, the compositor will still emit
+ * a configure event with the "maximized" state.
+ */
+static inline void
+zxdg_toplevel_v6_set_maximized(struct zxdg_toplevel_v6 *zxdg_toplevel_v6)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_SET_MAXIMIZED);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Unmaximize the surface.
+ *
+ * After requesting that the surface should be unmaximized, the compositor
+ * will respond by emitting a configure event without the "maximized"
+ * state. If available, the compositor will include the window geometry
+ * dimensions the window had prior to being maximized in the configure
+ * request. The client must then update its content, drawing it in a
+ * regular state, i.e. potentially with shadow, etc. The client must also
+ * acknowledge the configure when committing the new content (see
+ * ack_configure).
+ *
+ * It is up to the compositor to position the surface after it was
+ * unmaximized; usually the position the surface had before maximizing, if
+ * applicable.
+ *
+ * If the surface was already not maximized, the compositor will still
+ * emit a configure event without the "maximized" state.
+ */
+static inline void
+zxdg_toplevel_v6_unset_maximized(struct zxdg_toplevel_v6 *zxdg_toplevel_v6)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_UNSET_MAXIMIZED);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Make the surface fullscreen.
+ *
+ * You can specify an output that you would prefer to be fullscreen.
+ * If this value is NULL, it's up to the compositor to choose which
+ * display will be used to map this surface.
+ *
+ * If the surface doesn't cover the whole output, the compositor will
+ * position the surface in the center of the output and compensate with
+ * black borders filling the rest of the output.
+ */
+static inline void
+zxdg_toplevel_v6_set_fullscreen(struct zxdg_toplevel_v6 *zxdg_toplevel_v6, struct wl_output *output)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_SET_FULLSCREEN, output);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ */
+static inline void
+zxdg_toplevel_v6_unset_fullscreen(struct zxdg_toplevel_v6 *zxdg_toplevel_v6)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_UNSET_FULLSCREEN);
+}
+
+/**
+ * @ingroup iface_zxdg_toplevel_v6
+ *
+ * Request that the compositor minimize your surface. There is no
+ * way to know if the surface is currently minimized, nor is there
+ * any way to unset minimization on this surface.
+ *
+ * If you are looking to throttle redrawing when minimized, please
+ * instead use the wl_surface.frame event for this, as this will
+ * also work with live previews on windows in Alt-Tab, Expose or
+ * similar compositor features.
+ */
+static inline void
+zxdg_toplevel_v6_set_minimized(struct zxdg_toplevel_v6 *zxdg_toplevel_v6)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_toplevel_v6,
+       ZXDG_TOPLEVEL_V6_SET_MINIMIZED);
+}
+
+#ifndef ZXDG_POPUP_V6_ERROR_ENUM
+#define ZXDG_POPUP_V6_ERROR_ENUM
+enum zxdg_popup_v6_error {
+  /**
+   * tried to grab after being mapped
+   */
+  ZXDG_POPUP_V6_ERROR_INVALID_GRAB = 0,
+};
+#endif /* ZXDG_POPUP_V6_ERROR_ENUM */
+
+/**
+ * @ingroup iface_zxdg_popup_v6
+ * @struct zxdg_popup_v6_listener
+ */
+struct zxdg_popup_v6_listener {
+  /**
+   * configure the popup surface
+   *
+   * This event asks the popup surface to configure itself given
+   * the configuration. The configured state should not be applied
+   * immediately. See xdg_surface.configure for details.
+   *
+   * The x and y arguments represent the position the popup was
+   * placed at given the xdg_positioner rule, relative to the upper
+   * left corner of the window geometry of the parent surface.
+   * @param x x position relative to parent surface window geometry
+   * @param y y position relative to parent surface window geometry
+   * @param width window geometry width
+   * @param height window geometry height
+   */
+  void (*configure)(void *data,
+        struct zxdg_popup_v6 *zxdg_popup_v6,
+        int32_t x,
+        int32_t y,
+        int32_t width,
+        int32_t height);
+  /**
+   * popup interaction is done
+   *
+   * The popup_done event is sent out when a popup is dismissed by
+   * the compositor. The client should destroy the xdg_popup object
+   * at this point.
+   */
+  void (*popup_done)(void *data,
+         struct zxdg_popup_v6 *zxdg_popup_v6);
+};
+
+/**
+ * @ingroup iface_zxdg_popup_v6
+ */
+static inline int
+zxdg_popup_v6_add_listener(struct zxdg_popup_v6 *zxdg_popup_v6,
+         const struct zxdg_popup_v6_listener *listener, void *data)
+{
+  return wl_proxy_add_listener((struct wl_proxy *) zxdg_popup_v6,
+             (void (**)(void)) listener, data);
+}
+
+#define ZXDG_POPUP_V6_DESTROY 0
+#define ZXDG_POPUP_V6_GRAB 1
+
+/**
+ * @ingroup iface_zxdg_popup_v6
+ */
+#define ZXDG_POPUP_V6_CONFIGURE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_popup_v6
+ */
+#define ZXDG_POPUP_V6_POPUP_DONE_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_zxdg_popup_v6
+ */
+#define ZXDG_POPUP_V6_DESTROY_SINCE_VERSION 1
+/**
+ * @ingroup iface_zxdg_popup_v6
+ */
+#define ZXDG_POPUP_V6_GRAB_SINCE_VERSION 1
+
+/** @ingroup iface_zxdg_popup_v6 */
+static inline void
+zxdg_popup_v6_set_user_data(struct zxdg_popup_v6 *zxdg_popup_v6, void *user_data)
+{
+  wl_proxy_set_user_data((struct wl_proxy *) zxdg_popup_v6, user_data);
+}
+
+/** @ingroup iface_zxdg_popup_v6 */
+static inline void *
+zxdg_popup_v6_get_user_data(struct zxdg_popup_v6 *zxdg_popup_v6)
+{
+  return wl_proxy_get_user_data((struct wl_proxy *) zxdg_popup_v6);
+}
+
+static inline uint32_t
+zxdg_popup_v6_get_version(struct zxdg_popup_v6 *zxdg_popup_v6)
+{
+  return wl_proxy_get_version((struct wl_proxy *) zxdg_popup_v6);
+}
+
+/**
+ * @ingroup iface_zxdg_popup_v6
+ *
+ * This destroys the popup. Explicitly destroying the xdg_popup
+ * object will also dismiss the popup, and unmap the surface.
+ *
+ * If this xdg_popup is not the "topmost" popup, a protocol error
+ * will be sent.
+ */
+static inline void
+zxdg_popup_v6_destroy(struct zxdg_popup_v6 *zxdg_popup_v6)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_popup_v6,
+       ZXDG_POPUP_V6_DESTROY);
+
+  wl_proxy_destroy((struct wl_proxy *) zxdg_popup_v6);
+}
+
+/**
+ * @ingroup iface_zxdg_popup_v6
+ *
+ * This request makes the created popup take an explicit grab. An explicit
+ * grab will be dismissed when the user dismisses the popup, or when the
+ * client destroys the xdg_popup. This can be done by the user clicking
+ * outside the surface, using the keyboard, or even locking the screen
+ * through closing the lid or a timeout.
+ *
+ * If the compositor denies the grab, the popup will be immediately
+ * dismissed.
+ *
+ * This request must be used in response to some sort of user action like a
+ * button press, key press, or touch down event. The serial number of the
+ * event should be passed as 'serial'.
+ *
+ * The parent of a grabbing popup must either be an xdg_toplevel surface or
+ * another xdg_popup with an explicit grab. If the parent is another
+ * xdg_popup it means that the popups are nested, with this popup now being
+ * the topmost popup.
+ *
+ * Nested popups must be destroyed in the reverse order they were created
+ * in, e.g. the only popup you are allowed to destroy at all times is the
+ * topmost one.
+ *
+ * When compositors choose to dismiss a popup, they may dismiss every
+ * nested grabbing popup as well. When a compositor dismisses popups, it
+ * will follow the same dismissing order as required from the client.
+ *
+ * The parent of a grabbing popup must either be another xdg_popup with an
+ * active explicit grab, or an xdg_popup or xdg_toplevel, if there are no
+ * explicit grabs already taken.
+ *
+ * If the topmost grabbing popup is destroyed, the grab will be returned to
+ * the parent of the popup, if that parent previously had an explicit grab.
+ *
+ * If the parent is a grabbing popup which has already been dismissed, this
+ * popup will be immediately dismissed. If the parent is a popup that did
+ * not take an explicit grab, an error will be raised.
+ *
+ * During a popup grab, the client owning the grab will receive pointer
+ * and touch events for all their surfaces as normal (similar to an
+ * "owner-events" grab in X11 parlance), while the top most grabbing popup
+ * will always have keyboard focus.
+ */
+static inline void
+zxdg_popup_v6_grab(struct zxdg_popup_v6 *zxdg_popup_v6, struct wl_seat *seat, uint32_t serial)
+{
+  wl_proxy_marshal((struct wl_proxy *) zxdg_popup_v6,
+       ZXDG_POPUP_V6_GRAB, seat, serial);
+}
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/vulkaninfo/outputprinter.h b/vulkaninfo/outputprinter.h
index 37a0a9f..5bb3700 100644
--- a/vulkaninfo/outputprinter.h
+++ b/vulkaninfo/outputprinter.h
@@ -742,4 +742,4 @@
 
   private:
     Printer &p;
-};
\ No newline at end of file
+};
diff --git a/vulkaninfo/vulkaninfo.h b/vulkaninfo/vulkaninfo.h
index 6dcb9f1..6136b0a 100644
--- a/vulkaninfo/vulkaninfo.h
+++ b/vulkaninfo/vulkaninfo.h
@@ -66,7 +66,7 @@
 #endif
 #endif  // _WIN32
 
-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__Fuchsia__)
 #include <dlfcn.h>
 #endif
 
@@ -262,7 +262,7 @@
 // ----------- Instance Setup ------- //
 struct VkDll {
     VkResult Initialize() {
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__Fuchsia__)
         library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
         if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
 #elif defined(_WIN32)
@@ -429,13 +429,13 @@
   private:
     template <typename T>
     void Load(T &func_dest, const char *func_name) {
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__Fuchsia__)
         func_dest = reinterpret_cast<T>(dlsym(library, func_name));
 #elif defined(_WIN32)
         func_dest = reinterpret_cast<T>(GetProcAddress(library, func_name));
 #endif
     }
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__Fuchsia__)
     void *library;
 #elif defined(_WIN32)
     HMODULE library;
@@ -1765,4 +1765,4 @@
         }
     }
     return map;
-}
\ No newline at end of file
+}