diff options
Diffstat (limited to 'src/gpu/SkGpuDevice.cpp')
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 823e9b84ff..c2d8bdad32 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -193,7 +193,6 @@ GrRenderTarget* SkGpuDevice::CreateRenderTarget( SkColorType ct = origInfo.colorType(); SkAlphaType at = origInfo.alphaType(); - SkColorProfileType pt = origInfo.profileType(); if (kRGB_565_SkColorType == ct) { at = kOpaque_SkAlphaType; // force this setting } else if (ct != kBGRA_8888_SkColorType && ct != kRGBA_8888_SkColorType) { @@ -203,13 +202,13 @@ GrRenderTarget* SkGpuDevice::CreateRenderTarget( if (kOpaque_SkAlphaType != at) { at = kPremul_SkAlphaType; // force this setting } - const SkImageInfo info = SkImageInfo::Make(origInfo.width(), origInfo.height(), ct, at, pt); + const SkImageInfo info = SkImageInfo::Make(origInfo.width(), origInfo.height(), ct, at); GrSurfaceDesc desc; desc.fFlags = kRenderTarget_GrSurfaceFlag; desc.fWidth = info.width(); desc.fHeight = info.height(); - desc.fConfig = SkImageInfo2GrPixelConfig(info, *context->caps()); + desc.fConfig = SkImageInfo2GrPixelConfig(info); desc.fSampleCnt = sampleCount; desc.fTextureStorageAllocator = textureStorageAllocator; desc.fIsMipMapped = false; @@ -228,7 +227,7 @@ bool SkGpuDevice::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size ASSERT_SINGLE_OWNER // TODO: teach fRenderTarget to take ImageInfo directly to specify the src pixels - GrPixelConfig config = SkImageInfo2GrPixelConfig(dstInfo, *fContext->caps()); + GrPixelConfig config = SkImageInfo2GrPixelConfig(dstInfo); if (kUnknown_GrPixelConfig == config) { return false; } @@ -245,7 +244,7 @@ bool SkGpuDevice::onWritePixels(const SkImageInfo& info, const void* pixels, siz int x, int y) { ASSERT_SINGLE_OWNER // TODO: teach fRenderTarget to take ImageInfo directly to specify the src pixels - GrPixelConfig config = SkImageInfo2GrPixelConfig(info, *fContext->caps()); + GrPixelConfig config = SkImageInfo2GrPixelConfig(info); if (kUnknown_GrPixelConfig == config) { return false; } |