diff options
author | Robert Phillips <robertphillips@google.com> | 2017-02-22 15:28:38 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-23 15:01:42 +0000 |
commit | 30f9bc69cfc506075e1fce8e7934f941c0203023 (patch) | |
tree | f15f11bcb790206acaff8bfe6bb881eb254bec39 /src/gpu/GrTextureContext.cpp | |
parent | bcfb8f639e516b673b6dbda41900efac69be2daf (diff) |
Switch GrTextureStripAtlas over to GrTextureProxies
This is split out of: https://skia-review.googlesource.com/c/8823/ (Remove GrFragmentProcessor-derived class' GrTexture-based ctors)
Change-Id: I9f602985b6010fc58b595e2be6d4e67e50179747
Reviewed-on: https://skia-review.googlesource.com/8881
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrTextureContext.cpp')
-rw-r--r-- | src/gpu/GrTextureContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrTextureContext.cpp b/src/gpu/GrTextureContext.cpp index 7e9069588b..75c9e308ef 100644 --- a/src/gpu/GrTextureContext.cpp +++ b/src/gpu/GrTextureContext.cpp @@ -133,15 +133,15 @@ bool GrTextureContext::onReadPixels(const SkImageInfo& dstInfo, void* dstBuffer, // TODO: move this (and GrRenderTargetContext::onReadPixels) to GrSurfaceContext? bool GrTextureContext::onWritePixels(const SkImageInfo& srcInfo, const void* srcBuffer, - size_t srcRowBytes, int x, int y) { + size_t srcRowBytes, int x, int y, + uint32_t flags) { // TODO: teach GrTexture to take ImageInfo directly to specify the src pixels GrPixelConfig config = SkImageInfo2GrPixelConfig(srcInfo, *fContext->caps()); if (kUnknown_GrPixelConfig == config) { return false; } - uint32_t flags = 0; if (kUnpremul_SkAlphaType == srcInfo.alphaType()) { - flags = GrContext::kUnpremul_PixelOpsFlag; + flags |= GrContext::kUnpremul_PixelOpsFlag; } // Deferral of the VRAM resources must end in this instance anyway |