commit 63e7973d1f01bd03216659b9d2267f83a752c8fb
author Brian Salomon <bsalomon@google.com> Mon May 15 21:23:13 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 17 13:27:12 2017 +0000
tree ab2a84bb98d437e7cd48953a24979f31a88aa020
parent 4d0dab9eca0d98de62c11bd31067dbf3f92e5c98

Remove GrSurfaceProxy::desc()

Adds a numStencilSamples() getter.

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

src/gpu/gl/GrGLCaps.cpp

diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 49274d7..977670d 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -2125,7 +2125,8 @@
     }
 
     {
-        bool srcIsMSAARenderbuffer = src->desc().fSampleCnt > 0 && this->usesMSAARenderBuffers();
+        bool srcIsMSAARenderbuffer = GrFSAAType::kUnifiedMSAA == src->fsaaType() &&
+                                     this->usesMSAARenderBuffers();
         if (srcIsMSAARenderbuffer) {
             // It's illegal to call CopyTexSubImage2D on a MSAA renderbuffer. Set up for FBO
             // blit or fail.