diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-04-26 16:31:38 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-26 21:44:43 +0000 |
| commit | a070ed7fccd8bc9c5f314e1a4ac090c497862836 (patch) | |
| tree | ecc4a4e13087343c756472d77385f46b20149653 /src/gpu/GrRenderTargetProxy.cpp | |
| parent | 848271111d6982fc0666fb195da1d9d8d279746e (diff) | |
Add InternalSurfaceFlag so we know if RenderTargetProxys and RenderTargets use GL FBO 0.
Bug: skia:7748
Change-Id: I2fda3cde12ccdef19fe06ff287a8024b58d28ef0
Reviewed-on: https://skia-review.googlesource.com/124048
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrRenderTargetProxy.cpp')
| -rw-r--r-- | src/gpu/GrRenderTargetProxy.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gpu/GrRenderTargetProxy.cpp b/src/gpu/GrRenderTargetProxy.cpp index c5d096d5db..5488625581 100644 --- a/src/gpu/GrRenderTargetProxy.cpp +++ b/src/gpu/GrRenderTargetProxy.cpp @@ -113,11 +113,9 @@ void GrRenderTargetProxy::onValidateSurface(const GrSurface* surface) { SkASSERT(surface->asRenderTarget()); SkASSERT(surface->asRenderTarget()->numStencilSamples() == this->numStencilSamples()); - // DDL TODO: re-enable this after skbug.com/7748 (Add FBO-0-ness to SkSurfaceCharacterization) - // is fixed. - // GrInternalSurfaceFlags proxyFlags = fSurfaceFlags; - // GrInternalSurfaceFlags surfaceFlags = surface->surfacePriv().flags(); - // SkASSERT((proxyFlags & GrInternalSurfaceFlags::kRenderTargetMask) == - // (surfaceFlags & GrInternalSurfaceFlags::kRenderTargetMask)); + GrInternalSurfaceFlags proxyFlags = fSurfaceFlags; + GrInternalSurfaceFlags surfaceFlags = surface->surfacePriv().flags(); + SkASSERT((proxyFlags & GrInternalSurfaceFlags::kRenderTargetMask) == + (surfaceFlags & GrInternalSurfaceFlags::kRenderTargetMask)); } #endif |