Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: src/effects/SkDisplacementMapEffect.cpp

Issue 638403003: Remove uses of GrAutoScratchTexture. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/effects/SkAlphaThresholdFilter.cpp ('k') | src/effects/SkGpuBlurUtils.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkDisplacementMapEffect.h" 8 #include "SkDisplacementMapEffect.h"
9 #include "SkReadBuffer.h" 9 #include "SkReadBuffer.h"
10 #include "SkWriteBuffer.h" 10 #include "SkWriteBuffer.h"
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 GrTexture* color = colorBM.getTexture(); 407 GrTexture* color = colorBM.getTexture();
408 GrTexture* displacement = displacementBM.getTexture(); 408 GrTexture* displacement = displacementBM.getTexture();
409 GrContext* context = color->getContext(); 409 GrContext* context = color->getContext();
410 410
411 GrTextureDesc desc; 411 GrTextureDesc desc;
412 desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit; 412 desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
413 desc.fWidth = bounds.width(); 413 desc.fWidth = bounds.width();
414 desc.fHeight = bounds.height(); 414 desc.fHeight = bounds.height();
415 desc.fConfig = kSkia8888_GrPixelConfig; 415 desc.fConfig = kSkia8888_GrPixelConfig;
416 416
417 GrAutoScratchTexture ast(context, desc); 417 SkAutoTUnref<GrTexture> dst(
418 if (NULL == ast.texture()) { 418 context->refScratchTexture(desc, GrContext::kApprox_ScratchTexMatch));
419
420 if (!dst) {
419 return false; 421 return false;
420 } 422 }
421 SkAutoTUnref<GrTexture> dst(ast.detach());
422 423
423 GrContext::AutoRenderTarget art(context, dst->asRenderTarget()); 424 GrContext::AutoRenderTarget art(context, dst->asRenderTarget());
424 425
425 SkVector scale = SkVector::Make(fScale, fScale); 426 SkVector scale = SkVector::Make(fScale, fScale);
426 ctx.ctm().mapVectors(&scale, 1); 427 ctx.ctm().mapVectors(&scale, 1);
427 428
428 GrPaint paint; 429 GrPaint paint;
429 SkMatrix offsetMatrix = GrCoordTransform::MakeDivByTextureWHMatrix(displacem ent); 430 SkMatrix offsetMatrix = GrCoordTransform::MakeDivByTextureWHMatrix(displacem ent);
430 offsetMatrix.preTranslate(SkIntToScalar(colorOffset.fX - displacementOffset. fX), 431 offsetMatrix.preTranslate(SkIntToScalar(colorOffset.fX - displacementOffset. fX),
431 SkIntToScalar(colorOffset.fY - displacementOffset. fY)); 432 SkIntToScalar(colorOffset.fY - displacementOffset. fY));
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc, 632 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc,
632 const GrGLCaps&, GrProcessorKeyBuilder* b ) { 633 const GrGLCaps&, GrProcessorKeyBuilder* b ) {
633 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>(); 634 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>();
634 635
635 uint32_t xKey = displacementMap.xChannelSelector(); 636 uint32_t xKey = displacementMap.xChannelSelector();
636 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s; 637 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s;
637 638
638 b->add32(xKey | yKey); 639 b->add32(xKey | yKey);
639 } 640 }
640 #endif 641 #endif
OLDNEW
« no previous file with comments | « src/effects/SkAlphaThresholdFilter.cpp ('k') | src/effects/SkGpuBlurUtils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698