commit b7fc7a4677104ba8f8d556e2ae75e38b5cdaaa00
author Greg Daniel <egdaniel@google.com> Fri Oct 30 10:13:50 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 30 14:50:20 2020 +0000
tree 11590b27584d6f3b9c06d66f642151487b59a29c
parent 9615bcf71f2a06900309062b6c218f5bf7ce795c

Allow wrapping of protected AHB into vulkan SkSurfaces.

Bug: b/168500121
Change-Id: I9feda83181de53a45acd69a0001c3c1701d07b06
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330740
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/GrAHardwareBufferUtils.cpp

diff --git a/src/gpu/GrAHardwareBufferUtils.cpp b/src/gpu/GrAHardwareBufferUtils.cpp
index 618cf65..9bb29f5 100644
--- a/src/gpu/GrAHardwareBufferUtils.cpp
+++ b/src/gpu/GrAHardwareBufferUtils.cpp
@@ -310,6 +310,8 @@
     SkASSERT(dContext->backend() == GrBackendApi::kVulkan);
     GrVkGpu* gpu = static_cast<GrVkGpu*>(dContext->priv().getGpu());
 
+    SkASSERT(!isProtectedContent || gpu->protectedContext());
+
     VkPhysicalDevice physicalDevice = gpu->physicalDevice();
     VkDevice device = gpu->device();
 
@@ -383,10 +385,12 @@
     // to use linear. Add better linear support throughout Ganesh.
     VkImageTiling tiling = VK_IMAGE_TILING_OPTIMAL;
 
+    VkImageCreateFlags flags = isProtectedContent ? VK_IMAGE_CREATE_PROTECTED_BIT : 0;
+
     const VkImageCreateInfo imageCreateInfo = {
         VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,         // sType
         &externalMemoryImageInfo,                    // pNext
-        0,                                           // VkImageCreateFlags
+        flags,                                       // VkImageCreateFlags
         VK_IMAGE_TYPE_2D,                            // VkImageType
         format,                                      // VkFormat
         { (uint32_t)width, (uint32_t)height, 1 },    // VkExtent3D
@@ -490,6 +494,7 @@
     // support that extension. Or if we know the source of the AHardwareBuffer is not from a
     // "foreign" device we can leave them as external.
     imageInfo.fCurrentQueueFamily = VK_QUEUE_FAMILY_EXTERNAL;
+    imageInfo.fProtected = isProtectedContent ? GrProtected::kYes : GrProtected::kNo;
     imageInfo.fYcbcrConversionInfo = *ycbcrConversion;
     imageInfo.fSharingMode = imageCreateInfo.sharingMode;
 
@@ -521,6 +526,8 @@
         // function is called.
         static bool hasIt = can_import_protected_content_eglimpl();
         return hasIt;
+    } else if (GrBackendApi::kVulkan == dContext->backend()) {
+        return static_cast<GrVkGpu*>(dContext->priv().getGpu())->protectedContext();
     }
     return false;
 }
@@ -546,8 +553,6 @@
     } else {
         SkASSERT(GrBackendApi::kVulkan == dContext->backend());
 #ifdef SK_VULKAN
-        // Currently we don't support protected images on vulkan
-        SkASSERT(!createProtectedImage);
         return make_vk_backend_texture(dContext, hardwareBuffer, width, height, deleteProc,
                                        updateProc, imageCtx, createProtectedImage, backendFormat,
                                        isRenderable);