diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-02-02 13:51:50 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-02 23:37:59 +0000 |
| commit | 5bb82cbecd740d21b92e8d2944280ab6eb6af7a6 (patch) | |
| tree | 8171a4ea5d7f72dbba276b58a89a7e115066f24c /src/gpu/GrRenderTargetProxy.cpp | |
| parent | 1e5ef4f81ca18cd9448426891cda5120cea51de8 (diff) | |
Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend.""""
This reverts commit 18c52a7b52211de5d0dcd86dc048adef758c6c75.
Also relands "More sample count cleanup:" and "Add new GrContext queries for imagability, surfacability, and max sample count of color types"
Bug: skia:
Change-Id: I4028105a3a1f16ce3944e134619eb6245af6b947
Reviewed-on: https://skia-review.googlesource.com/102940
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrRenderTargetProxy.cpp')
| -rw-r--r-- | src/gpu/GrRenderTargetProxy.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gpu/GrRenderTargetProxy.cpp b/src/gpu/GrRenderTargetProxy.cpp index 9eb37a0b2f..841d4b18fd 100644 --- a/src/gpu/GrRenderTargetProxy.cpp +++ b/src/gpu/GrRenderTargetProxy.cpp @@ -26,7 +26,7 @@ GrRenderTargetProxy::GrRenderTargetProxy(const GrCaps& caps, const GrSurfaceDesc , fRenderTargetFlags(GrRenderTargetFlags::kNone) { // Since we know the newly created render target will be internal, we are able to precompute // what the flags will ultimately end up being. - if (caps.usesMixedSamples() && fSampleCnt > 0) { + if (caps.usesMixedSamples() && fSampleCnt > 1) { fRenderTargetFlags |= GrRenderTargetFlags::kMixedSampled; } if (caps.maxWindowRectangles() > 0) { @@ -97,7 +97,11 @@ sk_sp<GrSurface> GrRenderTargetProxy::createSurface(GrResourceProvider* resource } size_t GrRenderTargetProxy::onUninstantiatedGpuMemorySize() const { - int colorSamplesPerPixel = this->numColorSamples() + 1; + int colorSamplesPerPixel = this->numColorSamples(); + if (colorSamplesPerPixel > 1) { + // Add one for the resolve buffer. + ++colorSamplesPerPixel; + } // TODO: do we have enough information to improve this worst case estimate? return GrSurface::ComputeSize(this->config(), this->width(), this->height(), |