diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-25 19:28:22 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-25 20:03:07 +0000 |
| commit | 1c214313248a4b5a69af14539608c54fb67c2bf8 (patch) | |
| tree | faf812c90879556ed195f2556be389b10d5bda40 /src/gpu | |
| parent | 33fa454b1645610f5d69f635e35831e4344a9eb0 (diff) | |
Revert "Clear atlas textures at creation in Chrome"
This reverts commit 8785df15fe5a57651597d138d3c5aea0ffe3f661.
Reason for revert: Chrome bug
Bug: chromium:726226
Original change's description:
> Clear atlas textures at creation in Chrome
>
> Bug: chromium:656320
> Change-Id: Ia65274aa733f199be188579821e745920493aefc
> Reviewed-on: https://skia-review.googlesource.com/17824
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: chromium:656320
Change-Id: Ibc4dd7f184866b58481f2dc7e7e88da9169e7adc
Reviewed-on: https://skia-review.googlesource.com/17988
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrCaps.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/GrDrawOpAtlas.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp index e12af689c3..5c04d190c5 100644 --- a/src/gpu/GrCaps.cpp +++ b/src/gpu/GrCaps.cpp @@ -47,7 +47,6 @@ GrCaps::GrCaps(const GrContextOptions& options) { fPreferClientSideDynamicBuffers = false; fFullClearIsFree = false; fMustClearUploadedBufferData = false; - fMustClearAtlases = false; fSampleShadingSupport = false; fFenceSyncSupport = false; fCrossContextTextureSupport = false; diff --git a/src/gpu/GrDrawOpAtlas.cpp b/src/gpu/GrDrawOpAtlas.cpp index 235bc87a00..be8258ab51 100644 --- a/src/gpu/GrDrawOpAtlas.cpp +++ b/src/gpu/GrDrawOpAtlas.cpp @@ -24,10 +24,6 @@ std::unique_ptr<GrDrawOpAtlas> GrDrawOpAtlas::Make(GrContext* ctx, GrPixelConfig desc.fHeight = height; desc.fConfig = config; - if (ctx->caps()->mustClearAtlases()) { - desc.fFlags |= kPerformInitialClear_GrSurfaceFlag; - } - // We don't want to flush the context so we claim we're in the middle of flushing so as to // guarantee we do not recieve a texture with pending IO // TODO: Determine how to avoid having to do this. (https://bug.skia.org/4156) diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 0d1d4f6fff..6276eaf1c8 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -513,7 +513,6 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, if (kChromium_GrGLDriver == ctxInfo.driver()) { fMustClearUploadedBufferData = true; - fMustClearAtlases = true; } if (kGL_GrGLStandard == standard) { |