diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/GrCaps.cpp | 3 | ||||
-rwxr-xr-x | src/gpu/GrContext.cpp | 4 | ||||
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp index 2e956c7da5..ba4e10430d 100644 --- a/src/gpu/GrCaps.cpp +++ b/src/gpu/GrCaps.cpp @@ -109,7 +109,6 @@ GrCaps::GrCaps(const GrContextOptions& options) { fSupressPrints = options.fSuppressPrints; fDrawPathMasksToCompressedTextureSupport = options.fDrawPathToCompressedTexture; fGeometryBufferMapThreshold = options.fGeometryBufferMapThreshold; - fUseDrawInsteadOfPartialTextureWrite = options.fUseDrawInsteadOfPartialTextureWrite; } void GrCaps::applyOptionsOverrides(const GrContextOptions& options) { @@ -151,8 +150,6 @@ SkString GrCaps::dump() const { r.appendf("Oversized Stencil Support : %s\n", gNY[fOversizedStencilSupport]); r.appendf("Texture Barrier Support : %s\n", gNY[fTextureBarrierSupport]); r.appendf("Draw Instead of Clear [workaround] : %s\n", gNY[fUseDrawInsteadOfClear]); - r.appendf("Draw Instead of TexSubImage [workaround] : %s\n", - gNY[fUseDrawInsteadOfPartialTextureWrite]); if (this->advancedBlendEquationSupport()) { r.appendf("Advanced Blend Equation Blacklist : 0x%x\n", fAdvBlendEqBlacklist); } diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 073982329c..03aeaa8fcd 100755 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -334,9 +334,7 @@ bool GrContext::writeSurfacePixels(GrSurface* surface, { GrTexture* texture = NULL; if (!(kUnpremul_PixelOpsFlag & pixelOpsFlags) && (texture = surface->asTexture()) && - fGpu->canWriteTexturePixels(texture, srcConfig) && - (!fCaps->useDrawInsteadOfPartialTextureWrite() || - (width == texture->width() && height == texture->height()))) { + fGpu->canWriteTexturePixels(texture, srcConfig)) { if (!(kDontFlush_PixelOpsFlag & pixelOpsFlags) && surface->surfacePriv().hasPendingIO()) { diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index ccedc98bb5..63e215f585 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -421,10 +421,6 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, fUseDrawInsteadOfClear = true; } - if (kAdreno4xx_GrGLRenderer == ctxInfo.renderer()) { - fUseDrawInsteadOfPartialTextureWrite = true; - } - if (kGL_GrGLStandard == standard) { // ARB allows mixed size FBO attachments, EXT does not. if (ctxInfo.version() >= GR_GL_VER(3, 0) || |