commit 154ce91dc96187229d0bc84cf10a77f480194e6f
author Brian Salomon <bsalomon@google.com> Wed May 17 10:40:02 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 17 18:56:50 2017 +0000
tree a6528cbf005968f723a6add1327df6fce917626b
parent 98bff776d3cd1b077783e41092c3f1091d8c1519

Replace most uses of GrSurface::desc() with conifg(), width(), etc.

Change-Id: Ic283c0ddf9efa0a467e97e10f5413ba9dfcb414f
Reviewed-on: https://skia-review.googlesource.com/17211
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/vk/GrVkGpu.cpp

diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index e6a69b7..8469755 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -379,9 +379,9 @@
     }
 
     bool success = false;
-    if (GrPixelConfigIsCompressed(vkTex->desc().fConfig)) {
+    if (GrPixelConfigIsCompressed(vkTex->config())) {
         // We check that config == desc.fConfig in GrGpu::getWritePixelsInfo()
-        SkASSERT(config == vkTex->desc().fConfig);
+        SkASSERT(config == vkTex->config());
         // TODO: add compressed texture support
         // delete the following two lines and uncomment the two after that when ready
         vkTex->unref();
@@ -1716,7 +1716,7 @@
                                       int* effectiveSampleCnt, SamplePattern*) {
     // TODO: stub.
     SkASSERT(!this->caps()->sampleLocationsSupport());
-    *effectiveSampleCnt = rt->desc().fSampleCnt;
+    *effectiveSampleCnt = rt->numStencilSamples();
 }
 
 bool GrVkGpu::onGetReadPixelsInfo(GrSurface* srcSurface, int width, int height, size_t rowBytes,