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

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

Issue 1412863006: Fix some GPU filters to use the correct size constraint. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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 | « no previous file | src/effects/SkLightingImageFilter.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 "SkDevice.h" 9 #include "SkDevice.h"
10 #include "SkReadBuffer.h" 10 #include "SkReadBuffer.h"
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 GrTexture* color = colorBM.getTexture(); 413 GrTexture* color = colorBM.getTexture();
414 GrTexture* displacement = displacementBM.getTexture(); 414 GrTexture* displacement = displacementBM.getTexture();
415 GrContext* context = color->getContext(); 415 GrContext* context = color->getContext();
416 416
417 GrSurfaceDesc desc; 417 GrSurfaceDesc desc;
418 desc.fFlags = kRenderTarget_GrSurfaceFlag; 418 desc.fFlags = kRenderTarget_GrSurfaceFlag;
419 desc.fWidth = bounds.width(); 419 desc.fWidth = bounds.width();
420 desc.fHeight = bounds.height(); 420 desc.fHeight = bounds.height();
421 desc.fConfig = kSkia8888_GrPixelConfig; 421 desc.fConfig = kSkia8888_GrPixelConfig;
422 422
423 SkAutoTUnref<GrTexture> dst(context->textureProvider()->createApproxTexture( desc)); 423 auto constraint = GrTextureProvider::FromImageFilter(ctx.sizeConstraint());
424 SkAutoTUnref<GrTexture> dst(context->textureProvider()->createTexture(desc, constraint));
424 425
425 if (!dst) { 426 if (!dst) {
426 return false; 427 return false;
427 } 428 }
428 429
429 SkVector scale = SkVector::Make(fScale, fScale); 430 SkVector scale = SkVector::Make(fScale, fScale);
430 ctx.ctm().mapVectors(&scale, 1); 431 ctx.ctm().mapVectors(&scale, 1);
431 432
432 GrPaint paint; 433 GrPaint paint;
433 SkMatrix offsetMatrix = GrCoordTransform::MakeDivByTextureWHMatrix(displacem ent); 434 SkMatrix offsetMatrix = GrCoordTransform::MakeDivByTextureWHMatrix(displacem ent);
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 const GrGLSLCaps&, GrProcessorKeyBuilder* b) { 626 const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
626 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>(); 627 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>();
627 628
628 uint32_t xKey = displacementMap.xChannelSelector(); 629 uint32_t xKey = displacementMap.xChannelSelector();
629 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s; 630 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s;
630 631
631 b->add32(xKey | yKey); 632 b->add32(xKey | yKey);
632 } 633 }
633 #endif 634 #endif
634 635
OLDNEW
« no previous file with comments | « no previous file | src/effects/SkLightingImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698