commit 84911546b9535a2fff6c5e07f588f175d5a04f45
author Brian Salomon <bsalomon@google.com> Thu May 18 12:30:34 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 18 16:56:50 2017 +0000
tree a159707e8fbf27532b354b18feb231be69c12acc
parent 955235fa13db6cfd615dd6120e7f5060761fa3d1

Remove GrSurfaceDesc member from GrSurface.

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

src/gpu/gl/GrGLRenderTarget.cpp

diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp
index 7d45ceb..00a7840 100644
--- a/src/gpu/gl/GrGLRenderTarget.cpp
+++ b/src/gpu/gl/GrGLRenderTarget.cpp
@@ -215,7 +215,7 @@
     if (fTexFBOID == kUnresolvableFBOID || fTexFBOID != fRTFBOID) {
         // If the render target's FBO is external (fTexFBOID == kUnresolvableFBOID), or if we own
         // the render target's FBO (fTexFBOID == fRTFBOID) then we use the provided sample count.
-        return SkTMax(1, fDesc.fSampleCnt);
+        return SkTMax(1, this->numStencilSamples());
     }
 
     // When fTexFBOID == fRTFBOID, we either are not using MSAA, or MSAA is auto resolving, so use