commit b450f3be4f4ef27b703ac421f30e95348ab84c9b
author Brian Salomon <bsalomon@google.com> Tue Jul 09 09:36:51 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 09 15:00:43 2019 +0000
tree b4e3c43aabd41c7dc769949eeff3a424cd1fe9d4
parent 21ba586f32ebfd91941add15c7bf8366ead7e169

Use vkCmdClearColorImage to clear backend textures

Also don't use GrPixelConfig to create the VkImage.


Bug: skia:7959
Bug: skia:6718

Change-Id: Ia13c5ed2fbe0542c060b725694eff9d566c491f0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/226078
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 43f8319..da219a1 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -481,14 +481,15 @@
         return GrBackendTexture();
     }
 
-    GrBackendFormat format =
-            this->caps()->getBackendFormatFromColorType(SkColorTypeToGrColorType(colorType));
+    GrColorType ct = SkColorTypeToGrColorType(colorType);
+    GrBackendFormat format = this->caps()->getBackendFormatFromColorType(ct);
     if (!format.isValid()) {
         return GrBackendTexture();
     }
+    SkColor4f swizzledColor = this->caps()->getOutputSwizzle(format, ct).applyTo(color);
 
-    return this->createBackendTexture(width, height, format, color,
-                                      mipMapped, renderable, isProtected);
+    return this->createBackendTexture(width, height, format, swizzledColor, mipMapped, renderable,
+                                      isProtected);
 }
 
 void GrContext::deleteBackendTexture(GrBackendTexture backendTex) {