Update Vulkan headers to 1.1 (flutter#6806)

agd · Nov 9, 2018 · a64049a · a64049a
1 parent f5e5d81
commit a64049a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/DEPS b/DEPS
@@ -370,9 +370,9 @@ deps = {
   'src/third_party/gyp':
    Var('chromium_git') + '/external/gyp.git' + '@' + '4801a5331ae62da9769a327f11c4213d32fb0dad',
 
-   # Headers for Vulkan 1.0
+   # Headers for Vulkan 1.1
    'src/third_party/vulkan':
-   Var('github_git') + '/KhronosGroup/Vulkan-Docs.git' + '@' + 'e29c2489e238509c41aeb8c7bce9d669a496344b',
+   Var('github_git') + '/KhronosGroup/Vulkan-Docs.git' + '@' + 'v1.1.91',
 
   'src/third_party/pkg/when':
    Var('dart_git') + '/when.git' + '@' + '0.2.0',

diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: fedb7db24a1a6d3e75988ebfaa58fe5c
+Signature: fc569d77237ef4247eb7a93bb2c989be
 
 UNUSED LICENSES:
 
@@ -466,8 +466,19 @@ FILE: ../../../third_party/dart/third_party/observatory_pub_packages/packages/qu
 FILE: ../../../third_party/dart/third_party/observatory_pub_packages/packages/quiver/lib/src/time/util.dart
 FILE: ../../../third_party/dart/third_party/observatory_pub_packages/packages/quiver/lib/strings.dart
 FILE: ../../../third_party/dart/third_party/observatory_pub_packages/packages/quiver/lib/time.dart
-FILE: ../../../third_party/vulkan/src/vulkan/vk_platform.h
-FILE: ../../../third_party/vulkan/src/vulkan/vulkan.h
+FILE: ../../../third_party/vulkan/include/vulkan/vk_platform.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_android.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_core.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_fuchsia.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_ios.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_macos.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_vi.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_wayland.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_win32.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_xcb.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_xlib.h
+FILE: ../../../third_party/vulkan/include/vulkan/vulkan_xlib_xrandr.h
 ----------------------------------------------------------------------------------------------------
 Apache License
 Version 2.0, January 2004

diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart
@@ -1903,8 +1903,8 @@ class RepositoryVulkanDirectory extends RepositoryDirectory {
 
   @override
   bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'doc' // documentation
-        && entry.name != 'out' // documentation
+    // Flutter only uses the headers in the include directory.
+    return entry.name == 'include'
         && super.shouldRecurse(entry);
   }
 

diff --git a/vulkan/vulkan_interface.cc b/vulkan/vulkan_interface.cc
@@ -62,6 +62,10 @@ std::string VulkanResultToString(VkResult result) {
       return "VK_RESULT_RANGE_SIZE";
     case VK_RESULT_MAX_ENUM:
       return "VK_RESULT_MAX_ENUM";
+    case VK_ERROR_INVALID_EXTERNAL_HANDLE:
+      return "VK_ERROR_INVALID_EXTERNAL_HANDLE";
+    case VK_ERROR_OUT_OF_POOL_MEMORY:
+      return "VK_ERROR_OUT_OF_POOL_MEMORY";
 
 #if VK_HEADER_VERSION >= 63
     case VK_ERROR_NOT_PERMITTED_EXT:

diff --git a/vulkan/vulkan_native_surface_android.cc b/vulkan/vulkan_native_surface_android.cc
@@ -4,6 +4,8 @@
 
 #include "flutter/vulkan/vulkan_native_surface_android.h"
 
+#include <android/native_window.h>
+
 #include "third_party/skia/include/gpu/vk/GrVkBackendContext.h"
 
 namespace vulkan {