diff options
Diffstat (limited to 'src')
37 files changed, 93 insertions, 94 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index a628105001..f0476cd183 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1146,8 +1146,7 @@ static void draw_filter_into_device(SkBaseDevice* src, const SkImageFilter* filt // TODO: we should actually only copy the portion of the source needed to apply the image // filter GrContext* context = srcRT->getContext(); - SkAutoTUnref<GrTexture> tex(context->textureProvider()->createTexture(srcRT->desc(), - SkBudgeted::kYes)); + SkAutoTUnref<GrTexture> tex(context->textureProvider()->createTexture(srcRT->desc(), true)); context->copySurface(tex, srcRT); diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp index 155eb82242..dc831d7cbf 100644 --- a/src/core/SkImageCacherator.cpp +++ b/src/core/SkImageCacherator.cpp @@ -203,7 +203,7 @@ static GrTexture* load_compressed_into_texture(GrContext* ctx, SkData* data, GrS } desc.fConfig = config; - return ctx->textureProvider()->createTexture(desc, SkBudgeted::kYes, rawStart, 0); + return ctx->textureProvider()->createTexture(desc, true, rawStart, 0); } class Generator_GrYUVProvider : public GrYUVProvider { diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp index db192a36e2..398c6eb5df 100644 --- a/src/core/SkPictureImageGenerator.cpp +++ b/src/core/SkPictureImageGenerator.cpp @@ -138,7 +138,8 @@ GrTexture* SkPictureImageGenerator::onGenerateTexture(GrContext* ctx, const SkIR // // TODO: respect the usage, by possibly creating a different (pow2) surface // - SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkBudgeted::kYes, + SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, + SkSurface::kYes_Budgeted, surfaceInfo)); if (!surface.get()) { return nullptr; diff --git a/src/effects/GrCircleBlurFragmentProcessor.cpp b/src/effects/GrCircleBlurFragmentProcessor.cpp index 50fbbac601..39e3947049 100644 --- a/src/effects/GrCircleBlurFragmentProcessor.cpp +++ b/src/effects/GrCircleBlurFragmentProcessor.cpp @@ -247,7 +247,7 @@ GrTexture* GrCircleBlurFragmentProcessor::CreateCircleBlurProfileTexture( if (!blurProfile) { SkAutoTDeleteArray<uint8_t> profile(create_profile(halfWH, sigma)); - blurProfile = textureProvider->createTexture(texDesc, SkBudgeted::kYes, profile.get(), 0); + blurProfile = textureProvider->createTexture(texDesc, true, profile.get(), 0); if (blurProfile) { textureProvider->assignUniqueKeyToTexture(key, blurProfile); } diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 1be030baf6..6679e8aa41 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -794,7 +794,7 @@ GrTexture* GrRectBlurEffect::CreateBlurProfileTexture(GrTextureProvider* texture if (!blurProfile) { SkAutoTDeleteArray<uint8_t> profile(SkBlurMask::ComputeBlurProfile(sigma)); - blurProfile = textureProvider->createTexture(texDesc, SkBudgeted::kYes, profile.get(), 0); + blurProfile = textureProvider->createTexture(texDesc, true, profile.get(), 0); if (blurProfile) { textureProvider->assignUniqueKeyToTexture(key, blurProfile); } @@ -999,7 +999,7 @@ const GrFragmentProcessor* GrRRectBlurEffect::Create(GrTextureProvider* texProvi texDesc.fConfig = kAlpha_8_GrPixelConfig; blurNinePatchTexture.reset( - texProvider->createTexture(texDesc, SkBudgeted::kYes , blurredMask.fImage, 0)); + texProvider->createTexture(texDesc, true, blurredMask.fImage, 0)); SkMask::FreeImage(blurredMask.fImage); if (!blurNinePatchTexture) { return nullptr; diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp index 1d2f839f5b..4ddbc0c30f 100644 --- a/src/effects/SkColorCubeFilter.cpp +++ b/src/effects/SkColorCubeFilter.cpp @@ -315,7 +315,7 @@ const GrFragmentProcessor* SkColorCubeFilter::asFragmentProcessor(GrContext* con context->textureProvider()->findAndRefTextureByUniqueKey(key)); if (!textureCube) { textureCube.reset(context->textureProvider()->createTexture( - desc, SkBudgeted::kYes, fCubeData->data(), 0)); + desc, true, fCubeData->data(), 0)); if (textureCube) { context->textureProvider()->assignUniqueKeyToTexture(key, textureCube); } else { diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 8844f1ac83..2174b8569f 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -423,8 +423,7 @@ bool GrContext::readSurfacePixels(GrSurface* src, } SkAutoTUnref<GrTexture> temp; if (tempDrawInfo.fUseExactScratch) { - temp.reset(this->textureProvider()->createTexture(tempDrawInfo.fTempSurfaceDesc, - SkBudgeted::kYes)); + temp.reset(this->textureProvider()->createTexture(tempDrawInfo.fTempSurfaceDesc, true)); } else { temp.reset(this->textureProvider()->createApproxTexture(tempDrawInfo.fTempSurfaceDesc)); } diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index 8548e54a17..4fcd4d57af 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -88,7 +88,7 @@ static GrSurfaceOrigin resolve_origin(GrSurfaceOrigin origin, bool renderTarget) } } -GrTexture* GrGpu::createTexture(const GrSurfaceDesc& origDesc, SkBudgeted budgeted, +GrTexture* GrGpu::createTexture(const GrSurfaceDesc& origDesc, bool budgeted, const void* srcData, size_t rowBytes) { GrSurfaceDesc desc = origDesc; @@ -120,9 +120,8 @@ GrTexture* GrGpu::createTexture(const GrSurfaceDesc& origDesc, SkBudgeted budget } } - GrGpuResource::LifeCycle lifeCycle = SkBudgeted::kYes == budgeted ? - GrGpuResource::kCached_LifeCycle : - GrGpuResource::kUncached_LifeCycle; + GrGpuResource::LifeCycle lifeCycle = budgeted ? GrGpuResource::kCached_LifeCycle : + GrGpuResource::kUncached_LifeCycle; desc.fSampleCnt = SkTMin(desc.fSampleCnt, this->caps()->maxSampleCount()); // Attempt to catch un- or wrongly initialized sample counts; diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h index 0fef7a2015..fd134eae2c 100644 --- a/src/gpu/GrGpu.h +++ b/src/gpu/GrGpu.h @@ -93,7 +93,7 @@ public: * * @return The texture object if successful, otherwise nullptr. */ - GrTexture* createTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted, + GrTexture* createTexture(const GrSurfaceDesc& desc, bool budgeted, const void* srcData, size_t rowBytes); /** diff --git a/src/gpu/GrGpuResource.cpp b/src/gpu/GrGpuResource.cpp index 98cea1c9a8..a227fd2c0f 100644 --- a/src/gpu/GrGpuResource.cpp +++ b/src/gpu/GrGpuResource.cpp @@ -119,7 +119,7 @@ void GrGpuResource::setUniqueKey(const GrUniqueKey& key) { SkASSERT(key.isValid()); // Wrapped and uncached resources can never have a unique key. - if (SkBudgeted::kNo == this->resourcePriv().isBudgeted()) { + if (!this->resourcePriv().isBudgeted()) { return; } diff --git a/src/gpu/GrGpuResourceCacheAccess.h b/src/gpu/GrGpuResourceCacheAccess.h index 70fe08503e..8c272420a7 100644 --- a/src/gpu/GrGpuResourceCacheAccess.h +++ b/src/gpu/GrGpuResourceCacheAccess.h @@ -27,7 +27,7 @@ private: */ bool isScratch() const { return !fResource->getUniqueKey().isValid() && fResource->fScratchKey.isValid() && - SkBudgeted::kYes == fResource->resourcePriv().isBudgeted(); + fResource->resourcePriv().isBudgeted(); } /** diff --git a/src/gpu/GrGpuResourcePriv.h b/src/gpu/GrGpuResourcePriv.h index 62dc85059a..5324dccc22 100644 --- a/src/gpu/GrGpuResourcePriv.h +++ b/src/gpu/GrGpuResourcePriv.h @@ -44,10 +44,10 @@ public: /** * Does the resource count against the resource budget? */ - SkBudgeted isBudgeted() const { + bool isBudgeted() const { bool ret = GrGpuResource::kCached_LifeCycle == fResource->fLifeCycle; SkASSERT(ret || !fResource->getUniqueKey().isValid()); - return SkBudgeted(ret); + return ret; } /** diff --git a/src/gpu/GrLayerAtlas.cpp b/src/gpu/GrLayerAtlas.cpp index df8215a607..9beb509f86 100644 --- a/src/gpu/GrLayerAtlas.cpp +++ b/src/gpu/GrLayerAtlas.cpp @@ -66,7 +66,7 @@ void GrLayerAtlas::createBackingTexture() { desc.fHeight = fBackingTextureSize.height(); desc.fConfig = fPixelConfig; - fTexture.reset(fTexProvider->createTexture(desc, SkBudgeted::kYes, nullptr, 0)); + fTexture.reset(fTexProvider->createTexture(desc, true, nullptr, 0)); fTexture->resourcePriv().setUniqueKey(get_layer_atlas_key()); } diff --git a/src/gpu/GrLayerCache.cpp b/src/gpu/GrLayerCache.cpp index c2facbb12d..105ee04e53 100644 --- a/src/gpu/GrLayerCache.cpp +++ b/src/gpu/GrLayerCache.cpp @@ -255,7 +255,7 @@ bool GrLayerCache::lock(GrCachedLayer* layer, const GrSurfaceDesc& desc, bool* n // TODO: make the test for exact match depend on the image filters themselves SkAutoTUnref<GrTexture> tex; if (layer->fFilter) { - tex.reset(fContext->textureProvider()->createTexture(desc, SkBudgeted::kYes)); + tex.reset(fContext->textureProvider()->createTexture(desc, true)); } else { tex.reset(fContext->textureProvider()->createApproxTexture(desc)); } diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp index 005b6c4ccd..4a0c9b2b36 100644 --- a/src/gpu/GrResourceCache.cpp +++ b/src/gpu/GrResourceCache.cpp @@ -136,7 +136,7 @@ void GrResourceCache::insertResource(GrGpuResource* resource) { fHighWaterCount = SkTMax(this->getResourceCount(), fHighWaterCount); fHighWaterBytes = SkTMax(fBytes, fHighWaterBytes); #endif - if (SkBudgeted::kYes == resource->resourcePriv().isBudgeted()) { + if (resource->resourcePriv().isBudgeted()) { ++fBudgetedCount; fBudgetedBytes += size; TRACE_COUNTER2(TRACE_DISABLED_BY_DEFAULT("skia.gpu.cache"), "skia budget", "used", @@ -167,7 +167,7 @@ void GrResourceCache::removeResource(GrGpuResource* resource) { size_t size = resource->gpuMemorySize(); SkDEBUGCODE(--fCount;) fBytes -= size; - if (SkBudgeted::kYes == resource->resourcePriv().isBudgeted()) { + if (resource->resourcePriv().isBudgeted()) { --fBudgetedCount; fBudgetedBytes -= size; TRACE_COUNTER2(TRACE_DISABLED_BY_DEFAULT("skia.gpu.cache"), "skia budget", "used", @@ -375,7 +375,7 @@ void GrResourceCache::notifyCntReachedZero(GrGpuResource* resource, uint32_t fla this->removeFromNonpurgeableArray(resource); fPurgeableQueue.insert(resource); - if (SkBudgeted::kNo == resource->resourcePriv().isBudgeted()) { + if (!resource->resourcePriv().isBudgeted()) { // Check whether this resource could still be used as a scratch resource. if (!resource->cacheAccess().isExternal() && resource->resourcePriv().getScratchKey().isValid()) { @@ -414,7 +414,7 @@ void GrResourceCache::didChangeGpuMemorySize(const GrGpuResource* resource, size #if GR_CACHE_STATS fHighWaterBytes = SkTMax(fBytes, fHighWaterBytes); #endif - if (SkBudgeted::kYes == resource->resourcePriv().isBudgeted()) { + if (resource->resourcePriv().isBudgeted()) { fBudgetedBytes += delta; TRACE_COUNTER2(TRACE_DISABLED_BY_DEFAULT("skia.gpu.cache"), "skia budget", "used", fBudgetedBytes, "free", fMaxBytes - fBudgetedBytes); @@ -433,7 +433,7 @@ void GrResourceCache::didChangeBudgetStatus(GrGpuResource* resource) { size_t size = resource->gpuMemorySize(); - if (SkBudgeted::kYes == resource->resourcePriv().isBudgeted()) { + if (resource->resourcePriv().isBudgeted()) { ++fBudgetedCount; fBudgetedBytes += size; #if GR_CACHE_STATS @@ -664,7 +664,7 @@ void GrResourceCache::validate() const { SkASSERT(fScratchMap->countForKey(resource->resourcePriv().getScratchKey())); SkASSERT(!resource->cacheAccess().isExternal()); } else if (resource->resourcePriv().getScratchKey().isValid()) { - SkASSERT(SkBudgeted::kNo == resource->resourcePriv().isBudgeted() || + SkASSERT(!resource->resourcePriv().isBudgeted() || resource->getUniqueKey().isValid()); ++fCouldBeScratch; SkASSERT(fScratchMap->countForKey(resource->resourcePriv().getScratchKey())); @@ -675,10 +675,10 @@ void GrResourceCache::validate() const { ++fContent; SkASSERT(fUniqueHash->find(uniqueKey) == resource); SkASSERT(!resource->cacheAccess().isExternal()); - SkASSERT(SkBudgeted::kYes == resource->resourcePriv().isBudgeted()); + SkASSERT(resource->resourcePriv().isBudgeted()); } - if (SkBudgeted::kYes == resource->resourcePriv().isBudgeted()) { + if (resource->resourcePriv().isBudgeted()) { ++fBudgetedCount; fBudgetedBytes += resource->gpuMemorySize(); } diff --git a/src/gpu/GrResourceCache.h b/src/gpu/GrResourceCache.h index 8321289dff..adbfb7919f 100644 --- a/src/gpu/GrResourceCache.h +++ b/src/gpu/GrResourceCache.h @@ -220,7 +220,7 @@ public: if (resource->cacheAccess().isAdopted()) { ++fAdopted; } - if (SkBudgeted::kNo == resource->resourcePriv().isBudgeted()) { + if (!resource->resourcePriv().isBudgeted()) { fUnbudgetedSize += resource->gpuMemorySize(); } } diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp index dc14016973..f082a8693a 100644 --- a/src/gpu/GrTest.cpp +++ b/src/gpu/GrTest.cpp @@ -74,8 +74,8 @@ void GrContext::getTestTarget(GrTestTarget* tar, GrRenderTarget* rt) { desc.fConfig = kRGBA_8888_GrPixelConfig; desc.fSampleCnt = 0; - SkAutoTUnref<GrTexture> texture(this->textureProvider()->createTexture( - desc, SkBudgeted::kNo, nullptr, 0)); + SkAutoTUnref<GrTexture> texture(this->textureProvider()->createTexture(desc, false, + nullptr, 0)); if (nullptr == texture) { return; } diff --git a/src/gpu/GrTextureParamsAdjuster.cpp b/src/gpu/GrTextureParamsAdjuster.cpp index a78987cfb7..fd17d2adb4 100644 --- a/src/gpu/GrTextureParamsAdjuster.cpp +++ b/src/gpu/GrTextureParamsAdjuster.cpp @@ -63,8 +63,7 @@ static GrTexture* copy_on_gpu(GrTexture* inputTexture, const SkIRect* subset, } } - SkAutoTUnref<GrTexture> copy(context->textureProvider()->createTexture(rtDesc, - SkBudgeted::kYes)); + SkAutoTUnref<GrTexture> copy(context->textureProvider()->createTexture(rtDesc, true)); if (!copy) { return nullptr; } diff --git a/src/gpu/GrTextureProvider.cpp b/src/gpu/GrTextureProvider.cpp index 01c8a8e7a2..7d720eb121 100644 --- a/src/gpu/GrTextureProvider.cpp +++ b/src/gpu/GrTextureProvider.cpp @@ -29,7 +29,7 @@ GrTextureProvider::GrTextureProvider(GrGpu* gpu, GrResourceCache* cache, GrSingl { } -GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted, +GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budgeted, const void* srcData, size_t rowBytes) { ASSERT_SINGLE_OWNER if (this->isAbandoned()) { @@ -46,7 +46,7 @@ GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, SkBudgete if (GrTexture* texture = this->refScratchTexture(desc, kFlags)) { if (!srcData || texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig, srcData, rowBytes)) { - if (SkBudgeted::kNo == budgeted) { + if (!budgeted) { texture->resourcePriv().makeUnbudgeted(); } return texture; @@ -117,7 +117,7 @@ GrTexture* GrTextureProvider::refScratchTexture(const GrSurfaceDesc& inDesc, } if (!(kNoCreate_ScratchTextureFlag & flags)) { - return fGpu->createTexture(*desc, SkBudgeted::kYes, nullptr, 0); + return fGpu->createTexture(*desc, true, nullptr, 0); } return nullptr; diff --git a/src/gpu/GrYUVProvider.cpp b/src/gpu/GrYUVProvider.cpp index f889641849..844849a575 100644 --- a/src/gpu/GrYUVProvider.cpp +++ b/src/gpu/GrYUVProvider.cpp @@ -98,7 +98,7 @@ GrTexture* GrYUVProvider::refAsTexture(GrContext* ctx, const GrSurfaceDesc& desc bool needsExactTexture = (yuvDesc.fWidth != yuvInfo.fSize[0].fWidth) || (yuvDesc.fHeight != yuvInfo.fSize[0].fHeight); if (needsExactTexture) { - yuvTextures[i].reset(ctx->textureProvider()->createTexture(yuvDesc, SkBudgeted::kYes)); + yuvTextures[i].reset(ctx->textureProvider()->createTexture(yuvDesc, true)); } else { yuvTextures[i].reset(ctx->textureProvider()->createApproxTexture(yuvDesc)); } @@ -112,8 +112,7 @@ GrTexture* GrYUVProvider::refAsTexture(GrContext* ctx, const GrSurfaceDesc& desc GrSurfaceDesc rtDesc = desc; rtDesc.fFlags = rtDesc.fFlags | kRenderTarget_GrSurfaceFlag; - SkAutoTUnref<GrTexture> result(ctx->textureProvider()->createTexture(rtDesc, SkBudgeted::kYes, - nullptr, 0)); + SkAutoTUnref<GrTexture> result(ctx->textureProvider()->createTexture(rtDesc, true, nullptr, 0)); if (!result) { return nullptr; } diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index cf613a9cac..0b44a4281a 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -147,7 +147,7 @@ SkGpuDevice* SkGpuDevice::Create(GrRenderTarget* rt, int width, int height, return new SkGpuDevice(rt, width, height, props, flags); } -SkGpuDevice* SkGpuDevice::Create(GrContext* context, SkBudgeted budgeted, +SkGpuDevice* SkGpuDevice::Create(GrContext* context, SkSurface::Budgeted budgeted, const SkImageInfo& info, int sampleCount, const SkSurfaceProps* props, InitContents init, GrTextureStorageAllocator customAllocator) { @@ -185,7 +185,7 @@ SkGpuDevice::SkGpuDevice(GrRenderTarget* rt, int width, int height, } GrRenderTarget* SkGpuDevice::CreateRenderTarget( - GrContext* context, SkBudgeted budgeted, const SkImageInfo& origInfo, + GrContext* context, SkSurface::Budgeted budgeted, const SkImageInfo& origInfo, int sampleCount, GrTextureStorageAllocator textureStorageAllocator) { if (kUnknown_SkColorType == origInfo.colorType() || origInfo.width() < 0 || origInfo.height() < 0) { @@ -216,7 +216,8 @@ GrRenderTarget* SkGpuDevice::CreateRenderTarget( desc.fConfig = SkImageInfo2GrPixelConfig(info); desc.fSampleCnt = sampleCount; desc.fTextureStorageAllocator = textureStorageAllocator; - GrTexture* texture = context->textureProvider()->createTexture(desc, budgeted, nullptr, 0); + GrTexture* texture = context->textureProvider()->createTexture( + desc, SkToBool(budgeted), nullptr, 0); if (nullptr == texture) { return nullptr; } @@ -320,7 +321,9 @@ void SkGpuDevice::clearAll() { void SkGpuDevice::replaceRenderTarget(bool shouldRetainContent) { ASSERT_SINGLE_OWNER - SkBudgeted budgeted = fRenderTarget->resourcePriv().isBudgeted(); + SkSurface::Budgeted budgeted = + fRenderTarget->resourcePriv().isBudgeted() ? SkSurface::kYes_Budgeted + : SkSurface::kNo_Budgeted; SkAutoTUnref<GrRenderTarget> newRT(CreateRenderTarget( this->context(), budgeted, this->imageInfo(), fRenderTarget->desc().fSampleCnt, @@ -1781,7 +1784,7 @@ SkBaseDevice* SkGpuDevice::onCreateDevice(const CreateInfo& cinfo, const SkPaint if (kNever_TileUsage == cinfo.fTileUsage) { texture.reset(fContext->textureProvider()->createApproxTexture(desc)); } else { - texture.reset(fContext->textureProvider()->createTexture(desc, SkBudgeted::kYes)); + texture.reset(fContext->textureProvider()->createTexture(desc, true)); } if (texture) { @@ -1799,7 +1802,7 @@ SkBaseDevice* SkGpuDevice::onCreateDevice(const CreateInfo& cinfo, const SkPaint SkSurface* SkGpuDevice::newSurface(const SkImageInfo& info, const SkSurfaceProps& props) { ASSERT_SINGLE_OWNER // TODO: Change the signature of newSurface to take a budgeted parameter. - static const SkBudgeted kBudgeted = SkBudgeted::kNo; + static const SkSurface::Budgeted kBudgeted = SkSurface::kNo_Budgeted; return SkSurface::NewRenderTarget(fContext, kBudgeted, info, fRenderTarget->desc().fSampleCnt, &props); } diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h index 8fae408f87..ec3e158706 100644 --- a/src/gpu/SkGpuDevice.h +++ b/src/gpu/SkGpuDevice.h @@ -52,7 +52,7 @@ public: * sampleCount. The Budgeted param controls whether the device's backing store counts against * the resource cache budget. On failure, returns nullptr. */ - static SkGpuDevice* Create(GrContext*, SkBudgeted, const SkImageInfo&, + static SkGpuDevice* Create(GrContext*, SkSurface::Budgeted, const SkImageInfo&, int sampleCount, const SkSurfaceProps*, InitContents, GrTextureStorageAllocator = GrTextureStorageAllocator()); @@ -256,7 +256,7 @@ private: bool drawDashLine(const SkPoint pts[2], const SkPaint& paint); - static GrRenderTarget* CreateRenderTarget(GrContext*, SkBudgeted, const SkImageInfo&, + static GrRenderTarget* CreateRenderTarget(GrContext*, SkSurface::Budgeted, const SkImageInfo&, int sampleCount, GrTextureStorageAllocator); friend class GrAtlasTextContext; diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 85f36d9381..df65e451fe 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -212,7 +212,7 @@ static GrTexture* load_etc1_texture(GrContext* ctx, const SkBitmap &bm, GrSurfac return nullptr; } - return ctx->textureProvider()->createTexture(desc, SkBudgeted::kYes, startOfTexData, 0); + return ctx->textureProvider()->createTexture(desc, true, startOfTexData, 0); } GrTexture* GrUploadBitmapToTexture(GrContext* ctx, const SkBitmap& bmp) { @@ -233,7 +233,7 @@ GrTexture* GrUploadBitmapToTexture(GrContext* ctx, const SkBitmap& bmp) { // our compressed data will be trimmed, so pass width() for its // "rowBytes", since they are the same now. - return ctx->textureProvider()->createTexture(desc, SkBudgeted::kYes, storage.get(), + return ctx->textureProvider()->createTexture(desc, true, storage.get(), bitmap->width()); } else { bmp.copyTo(&tmpBitmap, kN32_SkColorType); @@ -265,7 +265,7 @@ GrTexture* GrUploadBitmapToTexture(GrContext* ctx, const SkBitmap& bmp) { return nullptr; } - return ctx->textureProvider()->createTexture(desc, SkBudgeted::kYes, bitmap->getPixels(), + return ctx->textureProvider()->createTexture(desc, true, bitmap->getPixels(), bitmap->rowBytes()); } diff --git a/src/gpu/SkGrPixelRef.cpp b/src/gpu/SkGrPixelRef.cpp index 6b75e6343c..e48cbf5d15 100644 --- a/src/gpu/SkGrPixelRef.cpp +++ b/src/gpu/SkGrPixelRef.cpp @@ -78,7 +78,7 @@ static SkGrPixelRef* copy_to_new_texture_pixelref(GrTexture* texture, SkColorTyp desc.fConfig = SkImageInfo2GrPixelConfig(dstCT, kPremul_SkAlphaType, dstPT); desc.fTextureStorageAllocator = texture->desc().fTextureStorageAllocator; - GrTexture* dst = context->textureProvider()->createTexture(desc, SkBudgeted::kNo, nullptr, 0); + GrTexture* dst = context->textureProvider()->createTexture(desc, false, nullptr, 0); if (nullptr == dst) { return nullptr; } diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 2725e5631d..4e168cd827 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -176,19 +176,16 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context desc.fHeight = 256; desc.fConfig = kRGBA_8888_GrPixelConfig; - SkAutoTUnref<GrTexture> readTex(context->textureProvider()->createTexture( - desc, SkBudgeted::kYes, nullptr, 0)); + SkAutoTUnref<GrTexture> readTex(context->textureProvider()->createTexture(desc, true, nullptr, 0)); if (!readTex.get()) { return; } - SkAutoTUnref<GrTexture> tempTex(context->textureProvider()->createTexture( - desc, SkBudgeted::kYes, nullptr, 0)); + SkAutoTUnref<GrTexture> tempTex(context->textureProvider()->createTexture(desc, true, nullptr, 0)); if (!tempTex.get()) { return; } desc.fFlags = kNone_GrSurfaceFlags; - SkAutoTUnref<GrTexture> dataTex(context->textureProvider()->createTexture( - desc, SkBudgeted::kYes, data, 0)); + SkAutoTUnref<GrTexture> dataTex(context->textureProvider()->createTexture(desc, true, data, 0)); if (!dataTex.get()) { return; } diff --git a/src/gpu/effects/GrTextureStripAtlas.cpp b/src/gpu/effects/GrTextureStripAtlas.cpp index 01d2679e6f..39bc3899b3 100644 --- a/src/gpu/effects/GrTextureStripAtlas.cpp +++ b/src/gpu/effects/GrTextureStripAtlas.cpp @@ -203,8 +203,7 @@ void GrTextureStripAtlas::lockTexture() { fTexture = fDesc.fContext->textureProvider()->findAndRefTextureByUniqueKey(key); if (nullptr == fTexture) { - fTexture = fDesc.fContext->textureProvider()->createTexture(texDesc, SkBudgeted::kYes, - nullptr, 0); + fTexture = fDesc.fContext->textureProvider()->createTexture(texDesc, true, nullptr, 0); if (!fTexture) { return; } diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 8e6fbadc7b..1070f53c5c 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -2197,7 +2197,7 @@ bool GrGLGpu::readPixelsSupported(GrPixelConfig rtConfig, GrPixelConfig readConf desc.fConfig = rtConfig; desc.fWidth = desc.fHeight = 16; desc.fFlags = kRenderTarget_GrSurfaceFlag; - SkAutoTUnref<GrTexture> temp(this->createTexture(desc, SkBudgeted::kNo, nullptr, 0)); + SkAutoTUnref<GrTexture> temp(this->createTexture(desc, false, nullptr, 0)); if (!temp) { return false; } diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 5521b6e305..e6ea9bd121 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -288,7 +288,8 @@ SkImage* SkImage::NewFromBitmap(const SkBitmap& bm) { if (GrTexture* tex = pr->getTexture()) { SkAutoTUnref<GrTexture> unrefCopy; if (!bm.isImmutable()) { - tex = GrDeepCopyTexture(tex, SkBudgeted::kNo); + const bool notBudgeted = false; + tex = GrDeepCopyTexture(tex, notBudgeted); if (nullptr == tex) { return nullptr; } @@ -296,7 +297,7 @@ SkImage* SkImage::NewFromBitmap(const SkBitmap& bm) { } const SkImageInfo info = bm.info(); return new SkImage_Gpu(info.width(), info.height(), bm.getGenerationID(), info.alphaType(), - tex, SkBudgeted::kNo); + tex, SkSurface::kNo_Budgeted); } #endif diff --git a/src/image/SkImagePriv.h b/src/image/SkImagePriv.h index acd0beb475..7518bbe808 100644 --- a/src/image/SkImagePriv.h +++ b/src/image/SkImagePriv.h @@ -56,6 +56,6 @@ extern void SkTextureImageApplyBudgetedDecision(SkImage* textureImage); // surface needs to perform a copy-on-write extern void SkTextureImageSetTexture(SkImage* image, GrTexture* texture); -GrTexture* GrDeepCopyTexture(GrTexture* src, SkBudgeted); +GrTexture* GrDeepCopyTexture(GrTexture* src, bool isBudgeted); #endif diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index e28a31d4bf..c502fc0092 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -20,7 +20,7 @@ #include "SkPixelRef.h" SkImage_Gpu::SkImage_Gpu(int w, int h, uint32_t uniqueID, SkAlphaType at, GrTexture* tex, - SkBudgeted budgeted) + SkSurface::Budgeted budgeted) : INHERITED(w, h, uniqueID) , fTexture(SkRef(tex)) , fAlphaType(at) @@ -140,7 +140,8 @@ SkImage* SkImage_Gpu::onNewSubset(const SkIRect& subset) const { desc.fWidth = subset.width(); desc.fHeight = subset.height(); - GrTexture* subTx = ctx->textureProvider()->createTexture(desc, fBudgeted); + GrTexture* subTx = ctx->textureProvider()->createTexture(desc, + SkSurface::kYes_Budgeted == fBudgeted); if (!subTx) { return nullptr; } @@ -166,7 +167,7 @@ static SkImage* new_wrapped_texture_common(GrContext* ctx, const GrBackendTextur tex->setRelease(releaseProc, releaseCtx); } - const SkBudgeted budgeted = SkBudgeted::kNo; + const SkSurface::Budgeted budgeted = SkSurface::kNo_Budgeted; return new SkImage_Gpu(desc.fWidth, desc.fHeight, kNeedNewImageUniqueID, at, tex, budgeted); } @@ -192,20 +193,22 @@ SkImage* SkImage::NewFromTextureCopy(GrContext* ctx, const GrBackendTextureDesc& return nullptr; } - SkAutoTUnref<GrTexture> dst(GrDeepCopyTexture(src, SkBudgeted::kYes)); + const bool isBudgeted = true; + SkAutoTUnref<GrTexture> dst(GrDeepCopyTexture(src, isBudgeted)); if (!dst) { return nullptr; } + const SkSurface::Budgeted budgeted = SkSurface::kYes_Budgeted; return new SkImage_Gpu(desc.fWidth, desc.fHeight, kNeedNewImageUniqueID, at, dst, - SkBudgeted::kYes); + budgeted); } SkImage* SkImage::NewFromYUVTexturesCopy(GrContext* ctx , SkYUVColorSpace colorSpace, const GrBackendObject yuvTextureHandles[3], const SkISize yuvSizes[3], GrSurfaceOrigin origin) { - const SkBudgeted budgeted = SkBudgeted::kYes; + const SkSurface::Budgeted budgeted = SkSurface::kYes_Budgeted; if (yuvSizes[0].fWidth <= 0 || yuvSizes[0].fHeight <= 0 || yuvSizes[1].fWidth <= 0 || yuvSizes[1].fHeight <= 0 || @@ -256,7 +259,7 @@ SkImage* SkImage::NewFromYUVTexturesCopy(GrContext* ctx , SkYUVColorSpace colorS dstDesc.fConfig = kRGBA_8888_GrPixelConfig; dstDesc.fSampleCnt = 0; - SkAutoTUnref<GrTexture> dst(ctx->textureProvider()->createTexture(dstDesc, SkBudgeted::kYes)); + SkAutoTUnref<GrTexture> dst(ctx->textureProvider()->createTexture(dstDesc, true)); if (!dst) { return nullptr; } @@ -285,7 +288,7 @@ static SkImage* create_image_from_maker(GrTextureMaker* maker, SkAlphaType at, u return nullptr; } return new SkImage_Gpu(texture->width(), texture->height(), id, at, texture, - SkBudgeted::kNo); + SkSurface::kNo_Budgeted); } SkImage* SkImage::newTextureImage(GrContext *context) const { @@ -312,7 +315,7 @@ SkImage* SkImage::newTextureImage(GrContext *context) const { /////////////////////////////////////////////////////////////////////////////////////////////////// -GrTexture* GrDeepCopyTexture(GrTexture* src, SkBudgeted budgeted) { +GrTexture* GrDeepCopyTexture(GrTexture* src, bool budgeted) { GrContext* ctx = src->getContext(); GrSurfaceDesc desc = src->desc(); diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h index d4640d4afc..a36c8ebc13 100644 --- a/src/image/SkImage_Gpu.h +++ b/src/image/SkImage_Gpu.h @@ -22,13 +22,13 @@ public: * An "image" can be a subset/window into a larger texture, so we explicit take the * width and height. */ - SkImage_Gpu(int w, int h, uint32_t uniqueID, SkAlphaType, GrTexture*, SkBudgeted); + SkImage_Gpu(int w, int h, uint32_t uniqueID, SkAlphaType, GrTexture*, SkSurface::Budgeted); ~SkImage_Gpu() override; void applyBudgetDecision() const { GrTexture* tex = this->getTexture(); SkASSERT(tex); - if (SkBudgeted::kYes == fBudgeted) { + if (fBudgeted) { tex->resourcePriv().makeBudgeted(); } else { tex->resourcePriv().makeUnbudgeted(); @@ -45,7 +45,7 @@ public: int srcX, int srcY, CachingHint) const override; SkSurface* onNewSurface(const SkImageInfo& info) const override { - return SkSurface::NewRenderTarget(fTexture->getContext(), SkBudgeted::kNo, info); + return SkSurface::NewRenderTarget(fTexture->getContext(), SkSurface::kNo_Budgeted, info); } bool asBitmapForImageFilters(SkBitmap* bitmap) const override; @@ -53,7 +53,7 @@ public: private: SkAutoTUnref<GrTexture> fTexture; const SkAlphaType fAlphaType; - const SkBudgeted fBudgeted; + const SkSurface::Budgeted fBudgeted; mutable SkAtomic<bool> fAddedRasterVersionToCache; diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp index b018ef9756..4fc904539b 100644 --- a/src/image/SkSurface.cpp +++ b/src/image/SkSurface.cpp @@ -79,7 +79,7 @@ SkSurface_Base::~SkSurface_Base() { } void SkSurface_Base::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) { - SkImage* image = this->newImageSnapshot(SkBudgeted::kYes); + SkImage* image = this->newImageSnapshot(kYes_Budgeted); if (image) { canvas->drawImage(image, x, y, paint); image->unref(); @@ -163,12 +163,12 @@ SkCanvas* SkSurface::getCanvas() { return asSB(this)->getCachedCanvas(); } -SkImage* SkSurface::newImageSnapshot(SkBudgeted budgeted) { +SkImage* SkSurface::newImageSnapshot(Budgeted budgeted) { // the caller will call unref() to balance this return asSB(this)->refCachedImage(budgeted, kNo_ForceUnique); } -SkImage* SkSurface::newImageSnapshot(SkBudgeted budgeted, ForceUnique unique) { +SkImage* SkSurface::newImageSnapshot(Budgeted budgeted, ForceUnique unique) { // the caller will call unref() to balance this return asSB(this)->refCachedImage(budgeted, unique); } @@ -211,7 +211,7 @@ SkSurface* SkSurface::NewRenderTargetDirect(GrRenderTarget*, const SkSurfaceProp return nullptr; } -SkSurface* SkSurface::NewRenderTarget(GrContext*, SkBudgeted, const SkImageInfo&, int, +SkSurface* SkSurface::NewRenderTarget(GrContext*, Budgeted, const SkImageInfo&, int, const SkSurfaceProps*, GrTextureStorageAllocator) { return nullptr; } diff --git a/src/image/SkSurface_Base.h b/src/image/SkSurface_Base.h index 0519a9b3c0..159780b33a 100644 --- a/src/image/SkSurface_Base.h +++ b/src/image/SkSurface_Base.h @@ -43,7 +43,7 @@ public: * must faithfully represent the current contents, even if the surface * is changed after this called (e.g. it is drawn to via its canvas). */ - virtual SkImage* onNewImageSnapshot(SkBudgeted, ForceCopyMode) = 0; + virtual SkImage* onNewImageSnapshot(Budgeted, ForceCopyMode) = 0; /** * Default implementation: @@ -81,7 +81,7 @@ public: virtual void onPrepareForExternalIO() {} inline SkCanvas* getCachedCanvas(); - inline SkImage* refCachedImage(SkBudgeted, ForceUnique); + inline SkImage* refCachedImage(Budgeted, ForceUnique); bool hasCachedImage() const { return fCachedImage != nullptr; } @@ -114,7 +114,7 @@ SkCanvas* SkSurface_Base::getCachedCanvas() { return fCachedCanvas; } -SkImage* SkSurface_Base::refCachedImage(SkBudgeted budgeted, ForceUnique unique) { +SkImage* SkSurface_Base::refCachedImage(Budgeted budgeted, ForceUnique unique) { SkImage* snap = fCachedImage; if (kYes_ForceUnique == unique && snap && !snap->unique()) { snap = nullptr; diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp index 5345ceee20..d1544630cc 100644 --- a/src/image/SkSurface_Gpu.cpp +++ b/src/image/SkSurface_Gpu.cpp @@ -72,12 +72,12 @@ SkSurface* SkSurface_Gpu::onNewSurface(const SkImageInfo& info) { GrRenderTarget* rt = fDevice->accessRenderTarget(); int sampleCount = rt->numColorSamples(); // TODO: Make caller specify this (change virtual signature of onNewSurface). - static const SkBudgeted kBudgeted = SkBudgeted::kNo; + static const Budgeted kBudgeted = kNo_Budgeted; return SkSurface::NewRenderTarget(fDevice->context(), kBudgeted, info, sampleCount, &this->props()); } -SkImage* SkSurface_Gpu::onNewImageSnapshot(SkBudgeted budgeted, ForceCopyMode forceCopyMode) { +SkImage* SkSurface_Gpu::onNewImageSnapshot(Budgeted budgeted, ForceCopyMode forceCopyMode) { GrRenderTarget* rt = fDevice->accessRenderTarget(); SkASSERT(rt); GrTexture* tex = rt->asTexture(); @@ -87,7 +87,7 @@ SkImage* SkSurface_Gpu::onNewImageSnapshot(SkBudgeted budgeted, ForceCopyMode fo GrSurfaceDesc desc = fDevice->accessRenderTarget()->desc(); GrContext* ctx = fDevice->context(); desc.fFlags = desc.fFlags & ~kRenderTarget_GrSurfaceFlag; - copy.reset(ctx->textureProvider()->createTexture(desc, budgeted)); + copy.reset(ctx->textureProvider()->createTexture(desc, kYes_Budgeted == budgeted)); if (!copy) { return nullptr; } @@ -112,7 +112,7 @@ void SkSurface_Gpu::onCopyOnWrite(ContentChangeMode mode) { GrRenderTarget* rt = fDevice->accessRenderTarget(); // are we sharing our render target with the image? Note this call should never create a new // image because onCopyOnWrite is only called when there is a cached image. - SkAutoTUnref<SkImage> image(this->refCachedImage(SkBudgeted::kNo, kNo_ForceUnique)); + SkAutoTUnref<SkImage> image(this->refCachedImage(kNo_Budgeted, kNo_ForceUnique)); SkASSERT(image); if (rt->asTexture() == as_IB(image)->getTexture()) { this->fDevice->replaceRenderTarget(SkSurface::kRetain_ContentChangeMode == mode); @@ -141,7 +141,7 @@ SkSurface* SkSurface::NewRenderTargetDirect(GrRenderTarget* target, const SkSurf return new SkSurface_Gpu(device); } -SkSurface* SkSurface::NewRenderTarget(GrContext* ctx, SkBudgeted budgeted, const SkImageInfo& info, +SkSurface* SkSurface::NewRenderTarget(GrContext* ctx, Budgeted budgeted, const SkImageInfo& info, int sampleCount, const SkSurfaceProps* props, GrTextureStorageAllocator customAllocator) { SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create( diff --git a/src/image/SkSurface_Gpu.h b/src/image/SkSurface_Gpu.h index 72e9caf462..dff7970d46 100644 --- a/src/image/SkSurface_Gpu.h +++ b/src/image/SkSurface_Gpu.h @@ -23,7 +23,7 @@ public: bool onGetRenderTargetHandle(GrBackendObject*, BackendHandleAccess) override; SkCanvas* onNewCanvas() override; SkSurface* onNewSurface(const SkImageInfo&) override; - SkImage* onNewImageSnapshot(SkBudgeted, ForceCopyMode) override; + SkImage* onNewImageSnapshot(Budgeted, ForceCopyMode) override; void onCopyOnWrite(ContentChangeMode) override; void onDiscard() override; void onPrepareForExternalIO() override; diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index d07e94998f..37790a0dd9 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -24,7 +24,7 @@ public: SkCanvas* onNewCanvas() override; SkSurface* onNewSurface(const SkImageInfo&) override; - SkImage* onNewImageSnapshot(SkBudgeted, ForceCopyMode) override; + SkImage* onNewImageSnapshot(Budgeted, ForceCopyMode) override; void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) override; void onCopyOnWrite(ContentChangeMode) override; void onRestoreBackingMutability() override; @@ -118,7 +118,7 @@ void SkSurface_Raster::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, canvas->drawBitmap(fBitmap, x, y, paint); } -SkImage* SkSurface_Raster::onNewImageSnapshot(SkBudgeted, ForceCopyMode forceCopyMode) { +SkImage* SkSurface_Raster::onNewImageSnapshot(Budgeted, ForceCopyMode forceCopyMode) { if (fWeOwnThePixels) { // SkImage_raster requires these pixels are immutable for its full lifetime. // We'll undo this via onRestoreBackingMutability() if we can avoid the COW. @@ -143,7 +143,7 @@ void SkSurface_Raster::onRestoreBackingMutability() { void SkSurface_Raster::onCopyOnWrite(ContentChangeMode mode) { // are we sharing pixelrefs with the image? - SkAutoTUnref<SkImage> cached(this->refCachedImage(SkBudgeted::kNo, kNo_ForceUnique)); + SkAutoTUnref<SkImage> cached(this->refCachedImage(kNo_Budgeted, kNo_ForceUnique)); SkASSERT(cached); if (SkBitmapImageGetPixelRef(cached) == fBitmap.pixelRef()) { SkASSERT(fWeOwnThePixels); diff --git a/src/utils/SkImageGeneratorUtils.cpp b/src/utils/SkImageGeneratorUtils.cpp index ebffb30b3f..928d052ec6 100644 --- a/src/utils/SkImageGeneratorUtils.cpp +++ b/src/utils/SkImageGeneratorUtils.cpp @@ -69,7 +69,7 @@ protected: desc.fWidth = subset->width(); desc.fHeight = subset->height(); - GrTexture* dst = fCtx->textureProvider()->createTexture(desc, SkBudgeted::kNo); + GrTexture* dst = fCtx->textureProvider()->createTexture(desc, false); fCtx->copySurface(dst, fTexture, *subset, SkIPoint::Make(0, 0)); return dst; } |