commit 638b2e8594dda8c6b5c53260c17828843517f760
author Greg Daniel <egdaniel@google.com> Thu Aug 27 14:29:00 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 27 20:05:29 2020 +0000
tree 834c2b19ebe879a1333cc7ccf3e272607524156f
parent f1bc828205eaecb628415d56bb228a3d4c4ef822

Add GrInternalSurfaceFlag for vulkan input attachment.

This also includes all the plumbing of this flag throughout our proxy
and surface system.

Bug: skia:10409
Change-Id: I48d40012049240cfa80e045ea090f68ce2d2ff0d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313676
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/GrContextThreadSafeProxy.cpp

diff --git a/src/gpu/GrContextThreadSafeProxy.cpp b/src/gpu/GrContextThreadSafeProxy.cpp
index 8514ff5..2f1ac1e 100644
--- a/src/gpu/GrContextThreadSafeProxy.cpp
+++ b/src/gpu/GrContextThreadSafeProxy.cpp
@@ -47,7 +47,7 @@
                                      int sampleCnt, GrSurfaceOrigin origin,
                                      const SkSurfaceProps& surfaceProps,
                                      bool isMipMapped, bool willUseGLFBO0, bool isTextureable,
-                                     GrProtected isProtected) {
+                                     GrProtected isProtected, bool vkRTSupportsInputAttachment) {
     SkASSERT(fCaps);
     if (!backendFormat.isValid()) {
         return {};
@@ -60,6 +60,11 @@
         return {};
     }
 
+    if (GrBackendApi::kVulkan != backendFormat.backend() && vkRTSupportsInputAttachment) {
+        // The vkRTSupportsInputAttachment flags can only be used for a Vulkan backend.
+        return {};
+    }
+
     if (!fCaps->mipmapSupport()) {
         isMipMapped = false;
     }
@@ -106,15 +111,17 @@
 #endif
     }
 
-    return SkSurfaceCharacterization(sk_ref_sp<GrContextThreadSafeProxy>(this),
-                                     cacheMaxResourceBytes, ii, backendFormat,
-                                     origin, sampleCnt,
-                                     SkSurfaceCharacterization::Textureable(isTextureable),
-                                     SkSurfaceCharacterization::MipMapped(isMipMapped),
-                                     SkSurfaceCharacterization::UsesGLFBO0(willUseGLFBO0),
-                                     SkSurfaceCharacterization::VulkanSecondaryCBCompatible(false),
-                                     isProtected,
-                                     surfaceProps);
+    return SkSurfaceCharacterization(
+            sk_ref_sp<GrContextThreadSafeProxy>(this),
+            cacheMaxResourceBytes, ii, backendFormat,
+            origin, sampleCnt,
+            SkSurfaceCharacterization::Textureable(isTextureable),
+            SkSurfaceCharacterization::MipMapped(isMipMapped),
+            SkSurfaceCharacterization::UsesGLFBO0(willUseGLFBO0),
+            SkSurfaceCharacterization::VkRTSupportsInputAttachment(vkRTSupportsInputAttachment),
+            SkSurfaceCharacterization::VulkanSecondaryCBCompatible(false),
+            isProtected,
+            surfaceProps);
 }
 
 GrBackendFormat GrContextThreadSafeProxy::defaultBackendFormat(SkColorType skColorType,