From 5254ccc1815e1b1bfa066a1ce193ddfdfcf16a55 Mon Sep 17 00:00:00 2001
From: Greg Daniel <egdaniel@google.com>
Date: Mon, 13 Nov 2017 11:05:52 -0500
Subject: Move pixel config getter to private in GrBackendSurface

We eventually want to remove pixel config from GrBackendSurface so this
helps to insure that clients don't rely on it.

Bug: skia:
Change-Id: I6b8435d12347fab62c0f9032addea1211aa703ca
Reviewed-on: https://skia-review.googlesource.com/70642
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
---
 include/gpu/GrBackendSurface.h | 16 ++++++++++++++--
 src/gpu/vk/GrVkGpu.cpp         |  9 +++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/include/gpu/GrBackendSurface.h b/include/gpu/GrBackendSurface.h
index bf1e52c959..c9d326bc36 100644
--- a/include/gpu/GrBackendSurface.h
+++ b/include/gpu/GrBackendSurface.h
@@ -51,7 +51,6 @@ public:
 
     int width() const { return fWidth; }
     int height() const { return fHeight; }
-    GrPixelConfig config() const { return fConfig; }
     bool hasMipMaps() const { return GrMipMapped::kYes == fMipMapped; }
     GrBackend backend() const {return fBackend; }
 
@@ -73,6 +72,13 @@ public:
     bool isValid() const { return fConfig != kUnknown_GrPixelConfig; }
 
 private:
+    // Friending for access to the GrPixelConfig
+    friend class SkSurface;
+    friend class GrGpu;
+    friend class GrGLGpu;
+    friend class GrVkGpu;
+    GrPixelConfig config() const { return fConfig; }
+
     int fWidth;         //<! width in pixels
     int fHeight;        //<! height in pixels
     GrPixelConfig fConfig;
@@ -109,7 +115,6 @@ public:
     int height() const { return fHeight; }
     int sampleCnt() const { return fSampleCnt; }
     int stencilBits() const { return fStencilBits; }
-    GrPixelConfig config() const { return fConfig; }
     GrBackend backend() const {return fBackend; }
 
     // If the backend API is GL, this returns a pointer to the GrGLFramebufferInfo struct. Otherwise
@@ -123,6 +128,13 @@ public:
 #endif
 
 private:
+    // Friending for access to the GrPixelConfig
+    friend class SkSurface;
+    friend class GrGpu;
+    friend class GrGLGpu;
+    friend class GrVkGpu;
+    GrPixelConfig config() const { return fConfig; }
+
     int fWidth;         //<! width in pixels
     int fHeight;        //<! height in pixels
 
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 198a00ed8e..a87c344d9a 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -888,7 +888,8 @@ bool GrVkGpu::updateBuffer(GrVkBuffer* buffer, const void* src,
 
 ////////////////////////////////////////////////////////////////////////////////
 
-static bool check_backend_texture(const GrBackendTexture& backendTex) {
+static bool check_backend_texture(const GrBackendTexture& backendTex,
+                                  GrPixelConfig config) {
     const GrVkImageInfo* info = backendTex.getVkImageInfo();
     if (!info) {
         return false;
@@ -898,13 +899,13 @@ static bool check_backend_texture(const GrBackendTexture& backendTex) {
         return false;
     }
 
-    SkASSERT(backendTex.config() == GrVkFormatToPixelConfig(info->fFormat));
+    SkASSERT(config == GrVkFormatToPixelConfig(info->fFormat));
     return true;
 }
 
 sk_sp<GrTexture> GrVkGpu::onWrapBackendTexture(const GrBackendTexture& backendTex,
                                                GrWrapOwnership ownership) {
-    if (!check_backend_texture(backendTex)) {
+    if (!check_backend_texture(backendTex, backendTex.config())) {
         return nullptr;
     }
 
@@ -922,7 +923,7 @@ sk_sp<GrTexture> GrVkGpu::onWrapBackendTexture(const GrBackendTexture& backendTe
 sk_sp<GrTexture> GrVkGpu::onWrapRenderableBackendTexture(const GrBackendTexture& backendTex,
                                                          int sampleCnt,
                                                          GrWrapOwnership ownership) {
-    if (!check_backend_texture(backendTex)) {
+    if (!check_backend_texture(backendTex, backendTex.config())) {
         return nullptr;
     }
 
-- 
cgit v1.2.3