Fix a SkiaRenderer + Vulkan crash on crbug.com page

Bug: 959800
Change-Id: I990dd544fe1d3b1a4ceacc5eda5c98e9f5c5ce22
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1599856
Commit-Queue: Peng Huang <penghuang@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#657552}

gpu/command_buffer/service/raster_decoder.cc

@@ -58,6 +58,7 @@
 #include "gpu/command_buffer/service/shared_image_representation.h"
 #include "gpu/command_buffer/service/skia_utils.h"
 #include "gpu/command_buffer/service/wrapped_sk_image.h"
+#include "gpu/vulkan/buildflags.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDeferredDisplayListRecorder.h"
 #include "third_party/skia/include/core/SkSurface.h"
@@ -73,6 +74,11 @@
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_version_info.h"
 
+#if BUILDFLAG(ENABLE_VULKAN)
+#include "components/viz/common/gpu/vulkan_context_provider.h"
+#include "gpu/vulkan/vulkan_device_queue.h"
+#endif
+
 // Local versions of the SET_GL_ERROR macros
 #define LOCAL_SET_GL_ERROR(error, function_name, msg) \
   ERRORSTATE_SET_GL_ERROR(error_state_.get(), error, function_name, msg)
@@ -866,7 +872,22 @@ Capabilities RasterDecoderImpl::GetCapabilities() {
   caps.texture_storage_image =
       feature_info()->feature_flags().chromium_texture_storage_image;
   caps.texture_storage = feature_info()->feature_flags().ext_texture_storage;
-  api()->glGetIntegervFn(GL_MAX_TEXTURE_SIZE, &caps.max_texture_size);
+  // TODO(piman): have a consistent limit in shared image backings.
+  // https://crbug.com/960588
+  if (shared_context_state_->GrContextIsGL()) {
+    api()->glGetIntegervFn(GL_MAX_TEXTURE_SIZE, &caps.max_texture_size);
+  } else if (shared_context_state_->GrContextIsVulkan()) {
+#if BUILDFLAG(ENABLE_VULKAN)
+    caps.max_texture_size = shared_context_state_->vk_context_provider()
+                                ->GetDeviceQueue()
+                                ->vk_physical_device_properties()
+                                .limits.maxImageDimension2D;
+#else
+    NOTREACHED();
+#endif
+  } else {
+    NOTIMPLEMENTED();
+  }
   if (feature_info()->workarounds().max_texture_size) {
     caps.max_texture_size = std::min(
         caps.max_texture_size, feature_info()->workarounds().max_texture_size);

gpu/vulkan/generate_bindings.py

@@ -32,6 +32,7 @@ VULKAN_PHYSICAL_DEVICE_FUNCTIONS = [
 { 'name': 'vkCreateDevice' },
 { 'name': 'vkEnumerateDeviceLayerProperties' },
 { 'name': 'vkGetPhysicalDeviceQueueFamilyProperties' },
+{ 'name': 'vkGetPhysicalDeviceProperties' },
 # The following functions belong here but are handled specially:
 # vkGetPhysicalDeviceSurfaceCapabilitiesKHR
 # vkGetPhysicalDeviceSurfaceFormatsKHR

gpu/vulkan/vulkan_device_queue.cc

@@ -88,6 +88,9 @@ bool VulkanDeviceQueue::Initialize(
     return false;
 
   vk_physical_device_ = devices[device_index];
+  vkGetPhysicalDeviceProperties(vk_physical_device_,
+                                &vk_physical_device_properties_);
+
   vk_queue_index_ = queue_index;
 
   float queue_priority = 0.0f;

gpu/vulkan/vulkan_device_queue.h

@@ -57,6 +57,10 @@ class VULKAN_EXPORT VulkanDeviceQueue {
     return vk_physical_device_;
   }
 
+  const VkPhysicalDeviceProperties& vk_physical_device_properties() const {
+    return vk_physical_device_properties_;
+  }
+
   VkDevice GetVulkanDevice() const {
     DCHECK_NE(static_cast<VkDevice>(VK_NULL_HANDLE), vk_device_);
     return vk_device_;
@@ -78,6 +82,7 @@ class VULKAN_EXPORT VulkanDeviceQueue {
  private:
   gfx::ExtensionSet enabled_extensions_;
   VkPhysicalDevice vk_physical_device_ = VK_NULL_HANDLE;
+  VkPhysicalDeviceProperties vk_physical_device_properties_;
   VkDevice owned_vk_device_ = VK_NULL_HANDLE;
   VkDevice vk_device_ = VK_NULL_HANDLE;
   VkQueue vk_queue_ = VK_NULL_HANDLE;

gpu/vulkan/vulkan_function_pointers.cc

@@ -101,6 +101,13 @@ bool VulkanFunctionPointers::BindPhysicalDeviceFunctionPointers(
   if (!vkGetPhysicalDeviceQueueFamilyPropertiesFn)
     return false;
 
+  vkGetPhysicalDevicePropertiesFn =
+      reinterpret_cast<PFN_vkGetPhysicalDeviceProperties>(
+          vkGetInstanceProcAddrFn(vk_instance,
+                                  "vkGetPhysicalDeviceProperties"));
+  if (!vkGetPhysicalDevicePropertiesFn)
+    return false;
+
   return true;
 }
 

gpu/vulkan/vulkan_function_pointers.h

@@ -75,6 +75,7 @@ struct VulkanFunctionPointers {
       nullptr;
   PFN_vkGetPhysicalDeviceQueueFamilyProperties
       vkGetPhysicalDeviceQueueFamilyPropertiesFn = nullptr;
+  PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDevicePropertiesFn = nullptr;
   PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR
       vkGetPhysicalDeviceSurfaceCapabilitiesKHRFn = nullptr;
   PFN_vkGetPhysicalDeviceSurfaceFormatsKHR
@@ -209,6 +210,8 @@ struct VulkanFunctionPointers {
   gpu::GetVulkanFunctionPointers()->vkEnumerateDeviceLayerPropertiesFn
 #define vkGetPhysicalDeviceQueueFamilyProperties \
   gpu::GetVulkanFunctionPointers()->vkGetPhysicalDeviceQueueFamilyPropertiesFn
+#define vkGetPhysicalDeviceProperties \
+  gpu::GetVulkanFunctionPointers()->vkGetPhysicalDevicePropertiesFn
 #define vkGetPhysicalDeviceSurfaceCapabilitiesKHR \
   gpu::GetVulkanFunctionPointers()->vkGetPhysicalDeviceSurfaceCapabilitiesKHRFn
 #define vkGetPhysicalDeviceSurfaceFormatsKHR \