diff options
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrClipMaskManager.cpp | 9 | ||||
| -rw-r--r-- | src/gpu/GrClipMaskManager.h | 5 | ||||
| -rw-r--r-- | src/gpu/GrContext.cpp | 10 | ||||
| -rw-r--r-- | src/gpu/GrDrawTargetCaps.h | 5 | ||||
| -rw-r--r-- | src/gpu/GrSWMaskHelper.cpp | 3 |
5 files changed, 21 insertions, 11 deletions
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp index bfca12f096..bcc71f4eae 100644 --- a/src/gpu/GrClipMaskManager.cpp +++ b/src/gpu/GrClipMaskManager.cpp @@ -392,7 +392,8 @@ void GrClipMaskManager::getTemp(int width, int height, GrAutoScratchTexture* tem // hit) bool GrClipMaskManager::getMaskTexture(int32_t clipStackGenID, const SkIRect& clipSpaceIBounds, - GrTexture** result) { + GrTexture** result, + bool willUpload) { bool cached = fAACache.canReuse(clipStackGenID, clipSpaceIBounds); if (!cached) { @@ -402,7 +403,7 @@ bool GrClipMaskManager::getMaskTexture(int32_t clipStackGenID, fAACache.reset(); GrTextureDesc desc; - desc.fFlags = kRenderTarget_GrTextureFlagBit; + desc.fFlags = willUpload ? kNone_GrTextureFlags : kRenderTarget_GrTextureFlagBit; desc.fWidth = clipSpaceIBounds.width(); desc.fHeight = clipSpaceIBounds.height(); desc.fConfig = kRGBA_8888_GrPixelConfig; @@ -427,7 +428,7 @@ GrTexture* GrClipMaskManager::createAlphaClipMask(int32_t clipStackGenID, SkASSERT(kNone_ClipMaskType == fCurrClipMaskType); GrTexture* result; - if (this->getMaskTexture(clipStackGenID, clipSpaceIBounds, &result)) { + if (this->getMaskTexture(clipStackGenID, clipSpaceIBounds, &result, false)) { fCurrClipMaskType = kAlpha_ClipMaskType; return result; } @@ -925,7 +926,7 @@ GrTexture* GrClipMaskManager::createSoftwareClipMask(int32_t clipStackGenID, SkASSERT(kNone_ClipMaskType == fCurrClipMaskType); GrTexture* result; - if (this->getMaskTexture(clipStackGenID, clipSpaceIBounds, &result)) { + if (this->getMaskTexture(clipStackGenID, clipSpaceIBounds, &result, true)) { return result; } diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h index fa9398786c..015c801d54 100644 --- a/src/gpu/GrClipMaskManager.h +++ b/src/gpu/GrClipMaskManager.h @@ -121,10 +121,11 @@ private: // Gets a texture to use for the clip mask. If true is returned then a cached mask was found // that already contains the rasterization of the clip stack, otherwise an uninitialized texture - // is returned. + // is returned. 'willUpload' is set when the alpha mask needs to be uploaded from the CPU. bool getMaskTexture(int32_t clipStackGenID, const SkIRect& clipSpaceIBounds, - GrTexture** result); + GrTexture** result, + bool willUpload); bool useSWOnlyPath(const GrReducedClip::ElementList& elements); diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index e3fc40062c..967738ac34 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -447,9 +447,9 @@ GrTexture* GrContext::lockAndRefScratchTexture(const GrTextureDesc& inDesc, Scra !(inDesc.fFlags & kRenderTarget_GrTextureFlagBit) || (inDesc.fConfig != kAlpha_8_GrPixelConfig)); - if (!fGpu->caps()->reuseScratchTextures()) { - // If we're never recycling scratch textures we can - // always make them the right size + if (!fGpu->caps()->reuseScratchTextures() && + !(inDesc.fFlags & kRenderTarget_GrTextureFlagBit)) { + // If we're never recycling this texture we can always make it the right size return create_scratch_texture(fGpu, fTextureCache, inDesc); } @@ -514,7 +514,7 @@ void GrContext::addExistingTextureToCache(GrTexture* texture) { // for the creation ref. Assert refcnt == 1. SkASSERT(texture->unique()); - if (fGpu->caps()->reuseScratchTextures()) { + if (fGpu->caps()->reuseScratchTextures() || NULL != texture->asRenderTarget()) { // Since this texture came from an AutoScratchTexture it should // still be in the exclusive pile. Recycle it. fTextureCache->makeNonExclusive(texture->getCacheEntry()); @@ -542,7 +542,7 @@ void GrContext::unlockScratchTexture(GrTexture* texture) { // while it was locked (to avoid two callers simultaneously getting // the same texture). if (texture->getCacheEntry()->key().isScratch()) { - if (fGpu->caps()->reuseScratchTextures()) { + if (fGpu->caps()->reuseScratchTextures() || NULL != texture->asRenderTarget()) { fTextureCache->makeNonExclusive(texture->getCacheEntry()); this->purgeCache(); } else if (texture->unique() && texture->getDeferredRefCount() <= 0) { diff --git a/src/gpu/GrDrawTargetCaps.h b/src/gpu/GrDrawTargetCaps.h index b0a721cd70..3c7fd6ae8c 100644 --- a/src/gpu/GrDrawTargetCaps.h +++ b/src/gpu/GrDrawTargetCaps.h @@ -37,6 +37,11 @@ public: bool bufferLockSupport() const { return fBufferLockSupport; } bool pathRenderingSupport() const { return fPathRenderingSupport; } bool dstReadInShaderSupport() const { return fDstReadInShaderSupport; } + + // Scratch textures not being reused means that those scratch textures + // that we upload to (i.e., don't have a render target) will not be + // recycled in the texture cache. This is to prevent ghosting by drivers + // (in particular for deferred architectures). bool reuseScratchTextures() const { return fReuseScratchTextures; } int maxRenderTargetSize() const { return fMaxRenderTargetSize; } diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp index 624b796f7e..5fb944bac4 100644 --- a/src/gpu/GrSWMaskHelper.cpp +++ b/src/gpu/GrSWMaskHelper.cpp @@ -138,6 +138,9 @@ void GrSWMaskHelper::toTexture(GrTexture *texture) { // writing since no one else will be using 'texture' bool reuseScratch = fContext->getGpu()->caps()->reuseScratchTextures(); + // Since we're uploading to it, 'texture' shouldn't have a render target. + SkASSERT(NULL == texture->asRenderTarget()); + texture->writePixels(0, 0, fBM.width(), fBM.height(), kAlpha_8_GrPixelConfig, fBM.getPixels(), fBM.rowBytes(), |