Revert "Clear atlas textures at creation in Chrome"
This reverts commit 8785df15fe
.
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>
This commit is contained in:
parent
33fa454b16
commit
1c21431324
@ -176,8 +176,6 @@ public:
|
||||
/** True in environments that will issue errors if memory uploaded to buffers
|
||||
is not initialized (even if not read by draw calls). */
|
||||
bool mustClearUploadedBufferData() const { return fMustClearUploadedBufferData; }
|
||||
/** True when there is a performance cost to using an atlas that has not been cleared. */
|
||||
bool mustClearAtlases() const { return fMustClearAtlases; }
|
||||
|
||||
bool wireframeMode() const { return fWireframeMode; }
|
||||
|
||||
@ -221,7 +219,6 @@ protected:
|
||||
bool fPreferClientSideDynamicBuffers : 1;
|
||||
bool fFullClearIsFree : 1;
|
||||
bool fMustClearUploadedBufferData : 1;
|
||||
bool fMustClearAtlases : 1;
|
||||
|
||||
// Driver workaround
|
||||
bool fUseDrawInsteadOfClear : 1;
|
||||
|
@ -47,7 +47,6 @@ GrCaps::GrCaps(const GrContextOptions& options) {
|
||||
fPreferClientSideDynamicBuffers = false;
|
||||
fFullClearIsFree = false;
|
||||
fMustClearUploadedBufferData = false;
|
||||
fMustClearAtlases = false;
|
||||
fSampleShadingSupport = false;
|
||||
fFenceSyncSupport = false;
|
||||
fCrossContextTextureSupport = false;
|
||||
|
@ -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)
|
||||
|
@ -513,7 +513,6 @@ void GrGLCaps::init(const GrContextOptions& contextOptions,
|
||||
|
||||
if (kChromium_GrGLDriver == ctxInfo.driver()) {
|
||||
fMustClearUploadedBufferData = true;
|
||||
fMustClearAtlases = true;
|
||||
}
|
||||
|
||||
if (kGL_GrGLStandard == standard) {
|
||||
|
Loading…
Reference in New Issue
Block a user