diff options
author | Brian Salomon <bsalomon@google.com> | 2017-02-28 16:11:04 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-28 21:49:28 +0000 |
commit | dac5f6bcbec7130a209a6899444feb022719498d (patch) | |
tree | dd552f45427514aca6a1a9be7c1c771de4292706 /include/private | |
parent | 621491e07eb66aee428db06173e27bbae7e9086a (diff) |
Fix -Wshadow-field warnings
BUG=skia:
Change-Id: I44f1e11787eab88bdc5ed25c34ea802e9001d427
Reviewed-on: https://skia-review.googlesource.com/9083
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include/private')
-rw-r--r-- | include/private/GrRenderTargetProxy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/private/GrRenderTargetProxy.h b/include/private/GrRenderTargetProxy.h index 63f0c21b52..3bf506c951 100644 --- a/include/private/GrRenderTargetProxy.h +++ b/include/private/GrRenderTargetProxy.h @@ -32,7 +32,7 @@ public: * For our purposes, "Mixed Sampled" means the stencil buffer is multisampled but the color * buffer is not. */ - bool isMixedSampled() const { return fFlags & GrRenderTarget::Flags::kMixedSampled; } + bool isMixedSampled() const { return fRenderTargetFlags & GrRenderTarget::Flags::kMixedSampled; } /** * "Unified Sampled" means the stencil and color buffers are both multisampled. @@ -78,7 +78,7 @@ private: // we know the newly created render target will be internal, we are able to precompute what the // flags will ultimately end up being. In the wrapped case we just copy the wrapped // rendertarget's info here. - GrRenderTarget::Flags fFlags; + GrRenderTarget::Flags fRenderTargetFlags; typedef GrSurfaceProxy INHERITED; }; |