| Index: src/gpu/SkGpuDevice.cpp
|
| diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
|
| index 270c458c59a8acd45ea19619bc5f42c359f830d3..4fdd4aea8a4df2ff11167d60da1e635f7a3ec274 100644
|
| --- a/src/gpu/SkGpuDevice.cpp
|
| +++ b/src/gpu/SkGpuDevice.cpp
|
| @@ -156,15 +156,13 @@
|
|
|
| SkGpuDevice* SkGpuDevice::Create(GrContext* context, SkSurface::Budgeted 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;
|
| }
|
| @@ -189,9 +187,8 @@
|
| fDrawContext.reset(this->context()->drawContext(rt, &this->surfaceProps()));
|
| }
|
|
|
| -GrRenderTarget* SkGpuDevice::CreateRenderTarget(
|
| - GrContext* context, SkSurface::Budgeted budgeted, const SkImageInfo& origInfo,
|
| - int sampleCount, GrTextureStorageAllocator textureStorageAllocator) {
|
| +GrRenderTarget* SkGpuDevice::CreateRenderTarget(GrContext* context, SkSurface::Budgeted budgeted,
|
| + const SkImageInfo& origInfo, int sampleCount) {
|
| if (kUnknown_SkColorType == origInfo.colorType() ||
|
| origInfo.width() < 0 || origInfo.height() < 0) {
|
| return nullptr;
|
| @@ -220,7 +217,6 @@
|
| desc.fHeight = info.height();
|
| desc.fConfig = SkImageInfo2GrPixelConfig(info);
|
| desc.fSampleCnt = sampleCount;
|
| - desc.fTextureStorageAllocator = textureStorageAllocator;
|
| GrTexture* texture = context->textureProvider()->createTexture(
|
| desc, SkToBool(budgeted), nullptr, 0);
|
| if (nullptr == texture) {
|
| @@ -340,8 +336,7 @@
|
| : SkSurface::kNo_Budgeted;
|
|
|
| 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;
|
| @@ -1493,7 +1488,7 @@
|
|
|
| SkRect srcR, dstR;
|
| while (iter.next(&srcR, &dstR)) {
|
| - this->drawTextureProducer(producer, &srcR, &dstR, SkCanvas::kStrict_SrcRectConstraint,
|
| + this->drawTextureProducer(producer, &srcR, &dstR, SkCanvas::kStrict_SrcRectConstraint,
|
| *draw.fMatrix, fClip, paint);
|
| }
|
| return;
|
|
|