commit 2bc96d6771654c026cf5319f3f72dce44e3992e8
author Greg Daniel <egdaniel@google.com> Mon Sep 13 13:08:02 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Sep 14 13:34:17 2021 +0000
tree b0eb4e6a15986d7268ff43837118c114e1841b28
parent 481a58dfe0eddd6736885b324d3cf14f5c10addb

Merge GrVkAttachment into GrVkImage.

Bug: skia:12402
Change-Id: I743724f66db8d7666d4d627d6945ce6bc3dc6bc3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/448261
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/vk/GrVkFramebuffer.cpp

diff --git a/src/gpu/vk/GrVkFramebuffer.cpp b/src/gpu/vk/GrVkFramebuffer.cpp
index dfbe9d2..79c31a3 100644
--- a/src/gpu/vk/GrVkFramebuffer.cpp
+++ b/src/gpu/vk/GrVkFramebuffer.cpp
@@ -7,9 +7,9 @@
 
 #include "src/gpu/vk/GrVkFramebuffer.h"
 
-#include "src/gpu/vk/GrVkAttachment.h"
 #include "src/gpu/vk/GrVkCommandBuffer.h"
 #include "src/gpu/vk/GrVkGpu.h"
+#include "src/gpu/vk/GrVkImage.h"
 #include "src/gpu/vk/GrVkImageView.h"
 #include "src/gpu/vk/GrVkRenderPass.h"
 
@@ -17,9 +17,9 @@
         GrVkGpu* gpu,
         SkISize dimensions,
         sk_sp<const GrVkRenderPass> compatibleRenderPass,
-        GrVkAttachment* colorAttachment,
-        GrVkAttachment* resolveAttachment,
-        GrVkAttachment* stencilAttachment,
+        GrVkImage* colorAttachment,
+        GrVkImage* resolveAttachment,
+        GrVkImage* stencilAttachment,
         GrVkResourceProvider::CompatibleRPHandle compatibleRenderPassHandle) {
     // At the very least we need a renderPass and a colorAttachment
     SkASSERT(compatibleRenderPass);
@@ -63,9 +63,9 @@
 
 GrVkFramebuffer::GrVkFramebuffer(const GrVkGpu* gpu,
                                  VkFramebuffer framebuffer,
-                                 sk_sp<GrVkAttachment> colorAttachment,
-                                 sk_sp<GrVkAttachment> resolveAttachment,
-                                 sk_sp<GrVkAttachment> stencilAttachment,
+                                 sk_sp<GrVkImage> colorAttachment,
+                                 sk_sp<GrVkImage> resolveAttachment,
+                                 sk_sp<GrVkImage> stencilAttachment,
                                  sk_sp<const GrVkRenderPass> compatibleRenderPass,
                                  GrVkResourceProvider::CompatibleRPHandle compatibleRPHandle)
         : GrVkManagedResource(gpu)
@@ -79,7 +79,7 @@
 }
 
 GrVkFramebuffer::GrVkFramebuffer(const GrVkGpu* gpu,
-                                 sk_sp<GrVkAttachment> colorAttachment,
+                                 sk_sp<GrVkImage> colorAttachment,
                                  sk_sp<const GrVkRenderPass> renderPass,
                                  std::unique_ptr<GrVkSecondaryCommandBuffer> externalCommandBuffer)
         : GrVkManagedResource(gpu)