commit 0a15cc62a898d500ecffd40f47ef3a3e2c23ecb9
author Robert Phillips <robertphillips@google.com> Tue Jul 30 12:49:10 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 30 17:45:45 2019 +0000
tree f51f958daf3aedaf1c5e13f02bce80061b16ac06
parent 81d526703ca96134c08a3fef3883f44c72587e5c

Propagate GrRenderable flag to GrCaps::getBackendFormatFromColorType

This makes calling GrCaps::getBackendFormatFromColorType equivalent to calling GrContext::defaultBackendFormat

Change-Id: Ic402245fa0502920c47c2a29aadc4e559abdc09b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/230416
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrRecordingContext.cpp

diff --git a/src/gpu/GrRecordingContext.cpp b/src/gpu/GrRecordingContext.cpp
index 64f4a40..d3a550f 100644
--- a/src/gpu/GrRecordingContext.cpp
+++ b/src/gpu/GrRecordingContext.cpp
@@ -176,7 +176,7 @@
         GrSurfaceOrigin origin,
         SkBudgeted budgeted,
         GrProtected isProtected) {
-    auto format = this->caps()->getBackendFormatFromColorType(colorType);
+    auto format = this->caps()->getDefaultBackendFormat(colorType, GrRenderable::kNo);
     if (!format.isValid()) {
         return nullptr;
     }
@@ -225,7 +225,7 @@
         return nullptr;
     }
 
-    auto format = this->caps()->getBackendFormatFromColorType(colorType);
+    auto format = this->caps()->getDefaultBackendFormat(colorType, GrRenderable::kYes);
     if (!format.isValid()) {
         return nullptr;
     }
@@ -409,19 +409,13 @@
 
     GrColorType grColorType = SkColorTypeToGrColorType(skColorType);
 
-    // TODO: pass the 'renderable' parameter into getBackendFormatFromColorType and change
-    // the texturabilit and renderability tests below into asserts
-    GrBackendFormat format = caps->getBackendFormatFromColorType(grColorType);
-    if (!caps->isFormatTexturable(grColorType, format)) {
+    GrBackendFormat format = caps->getDefaultBackendFormat(grColorType, renderable);
+    if (!format.isValid()) {
         return GrBackendFormat();
     }
 
-    if (renderable == GrRenderable::kYes) {
-        if (!caps->isFormatRenderable(grColorType, format)) {
-            return GrBackendFormat();
-        }
-    }
+    SkASSERT(caps->isFormatTexturable(grColorType, format));
+    SkASSERT(renderable == GrRenderable::kNo || caps->isFormatRenderable(grColorType, format));
 
     return format;
 }
-