commit f209e882fe969f6ff86715dbeee2fedf7a4271af
author Robert Phillips <robertphillips@google.com> Tue Jun 25 15:59:50 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jun 26 12:11:10 2019 +0000
tree a4dfb490b64bbacee6b4e634cb3e245924e75cd6
parent a5d1e67428c431ab5b25df3665658c1e00d87e65

Update SkSurface_Gpu::Valid to take a backend format

This is pulled out of:

https://skia-review.googlesource.com/c/skia/+/222781 (Add bridge between GrContext::createBackendTexture and SkSurface::MakeFromBackendTexture)

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

src/gpu/GrDrawingManager.cpp

diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 724cc15..4c83022 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -752,7 +752,7 @@
 
     // SkSurface catches bad color space usage at creation. This check handles anything that slips
     // by, including internal usage.
-    if (!SkSurface_Gpu::Valid(fContext->priv().caps(), sProxy->config(), colorSpace.get())) {
+    if (!SkSurface_Gpu::Valid(fContext->priv().caps(), sProxy->backendFormat())) {
         SkDEBUGFAIL("Invalid config and colorspace combination");
         return nullptr;
     }
@@ -777,7 +777,7 @@
 
     // SkSurface catches bad color space usage at creation. This check handles anything that slips
     // by, including internal usage.
-    if (!SkSurface_Gpu::Valid(fContext->priv().caps(), sProxy->config(), colorSpace.get())) {
+    if (!SkSurface_Gpu::Valid(fContext->priv().caps(), sProxy->backendFormat())) {
         SkDEBUGFAIL("Invalid config and colorspace combination");
         return nullptr;
     }