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

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

Issue 1971343002: Convert GrClip to an abstract base class (Closed) Base URL: https://skia.googlesource.com/skia.git@upload2_clipout
Patch Set: fix crash Created 4 years, 7 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/SkBlurMaskFilter.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 9
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 SkMatrix matrix; 335 SkMatrix matrix;
336 matrix.setTranslate(-SkIntToScalar(colorBounds.x()), -SkIntToScalar(colo rBounds.y())); 336 matrix.setTranslate(-SkIntToScalar(colorBounds.x()), -SkIntToScalar(colo rBounds.y()));
337 337
338 sk_sp<GrDrawContext> drawContext(context->newDrawContext(SkBackingFit::k Approx, 338 sk_sp<GrDrawContext> drawContext(context->newDrawContext(SkBackingFit::k Approx,
339 bounds.width(), bounds.height(), 339 bounds.width(), bounds.height(),
340 kSkia8888_GrPix elConfig)); 340 kSkia8888_GrPix elConfig));
341 if (!drawContext) { 341 if (!drawContext) {
342 return nullptr; 342 return nullptr;
343 } 343 }
344 344
345 drawContext->drawRect(GrClip::WideOpen(), paint, matrix, SkRect::Make(co lorBounds)); 345 drawContext->drawRect(GrNoClip(), paint, matrix, SkRect::Make(colorBound s));
346 346
347 offset->fX = bounds.left(); 347 offset->fX = bounds.left();
348 offset->fY = bounds.top(); 348 offset->fY = bounds.top();
349 return SkSpecialImage::MakeFromGpu(SkIRect::MakeWH(bounds.width(), bound s.height()), 349 return SkSpecialImage::MakeFromGpu(SkIRect::MakeWH(bounds.width(), bound s.height()),
350 kNeedNewImageUniqueID_SpecialImage, 350 kNeedNewImageUniqueID_SpecialImage,
351 drawContext->asTexture()); 351 drawContext->asTexture());
352 } 352 }
353 #endif 353 #endif
354 354
355 SkBitmap colorBM, displBM; 355 SkBitmap colorBM, displBM;
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc, 617 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc,
618 const GrGLSLCaps&, GrProcessorKeyBuilder* b) { 618 const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
619 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>(); 619 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>();
620 620
621 uint32_t xKey = displacementMap.xChannelSelector(); 621 uint32_t xKey = displacementMap.xChannelSelector();
622 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s; 622 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s;
623 623
624 b->add32(xKey | yKey); 624 b->add32(xKey | yKey);
625 } 625 }
626 #endif 626 #endif
OLDNEW
« no previous file with comments | « src/effects/SkBlurMaskFilter.cpp ('k') | src/effects/SkGpuBlurUtils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698