diff options
author | bsalomon <bsalomon@google.com> | 2016-04-13 14:29:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-13 14:29:25 -0700 |
commit | 7e68ab73186ab02a6030d3959e7372f983f85af5 (patch) | |
tree | 973b20fb786c0e2ac42344652ec07a36d112b3f8 /src/gpu/SkGpuDevice.cpp | |
parent | 0e3c55431b463b5575983c0c875909e08a3562bf (diff) |
Remove GrTextureStorageAllocator. This was added from Chromium but never used and not expected to be used.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1886613003
Review URL: https://codereview.chromium.org/1886613003
Diffstat (limited to 'src/gpu/SkGpuDevice.cpp')
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 9bc60c2036..4d82b201e7 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -144,15 +144,13 @@ SkGpuDevice* SkGpuDevice::Create(GrRenderTarget* rt, int width, int height, SkGpuDevice* SkGpuDevice::Create(GrContext* context, SkBudgeted budgeted, const SkImageInfo& info, int sampleCount, - const SkSurfaceProps* props, InitContents init, - GrTextureStorageAllocator customAllocator) { + const SkSurfaceProps* props, InitContents init) { unsigned flags; if (!CheckAlphaTypeAndGetFlags(&info, init, &flags)) { return nullptr; } - SkAutoTUnref<GrRenderTarget> rt(CreateRenderTarget( - context, budgeted, info, sampleCount, customAllocator)); + SkAutoTUnref<GrRenderTarget> rt(CreateRenderTarget(context, budgeted, info, sampleCount)); if (nullptr == rt) { return nullptr; } @@ -179,9 +177,8 @@ SkGpuDevice::SkGpuDevice(GrRenderTarget* rt, int width, int height, } } -GrRenderTarget* SkGpuDevice::CreateRenderTarget( - GrContext* context, SkBudgeted budgeted, const SkImageInfo& origInfo, - int sampleCount, GrTextureStorageAllocator textureStorageAllocator) { +GrRenderTarget* SkGpuDevice::CreateRenderTarget(GrContext* context, SkBudgeted budgeted, + const SkImageInfo& origInfo, int sampleCount) { if (kUnknown_SkColorType == origInfo.colorType() || origInfo.width() < 0 || origInfo.height() < 0) { return nullptr; @@ -211,7 +208,6 @@ GrRenderTarget* SkGpuDevice::CreateRenderTarget( desc.fHeight = info.height(); desc.fConfig = SkImageInfo2GrPixelConfig(info, *context->caps()); desc.fSampleCnt = sampleCount; - desc.fTextureStorageAllocator = textureStorageAllocator; desc.fIsMipMapped = false; GrTexture* texture = context->textureProvider()->createTexture(desc, budgeted, nullptr, 0); if (nullptr == texture) { @@ -359,8 +355,7 @@ void SkGpuDevice::replaceRenderTarget(bool shouldRetainContent) { SkBudgeted budgeted = fRenderTarget->resourcePriv().isBudgeted(); SkAutoTUnref<GrRenderTarget> newRT(CreateRenderTarget( - this->context(), budgeted, this->imageInfo(), fRenderTarget->desc().fSampleCnt, - fRenderTarget->desc().fTextureStorageAllocator)); + this->context(), budgeted, this->imageInfo(), fRenderTarget->desc().fSampleCnt)); if (nullptr == newRT) { return; |