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

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

Issue 2163343002: Adding color space to SkSpecialImage (Closed) Base URL: https://skia.googlesource.com/skia.git@colorspace-on-image
Patch Set: Created 4 years, 5 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
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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(GrNoClip(), paint, matrix, SkRect::Make(colorBound s)); 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();
robertphillips 2016/07/20 19:44:39 // TODO: ... ?
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 sk_ref_sp(source->getColorSpace()));
352 } 353 }
353 #endif 354 #endif
354 355
355 SkBitmap colorBM, displBM; 356 SkBitmap colorBM, displBM;
356 357
357 if (!color->getROPixels(&colorBM) || !displ->getROPixels(&displBM)) { 358 if (!color->getROPixels(&colorBM) || !displ->getROPixels(&displBM)) {
358 return nullptr; 359 return nullptr;
359 } 360 }
360 361
361 if ((colorBM.colorType() != kN32_SkColorType) || 362 if ((colorBM.colorType() != kN32_SkColorType) ||
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc, 618 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc,
618 const GrGLSLCaps&, GrProcessorKeyBuilder* b) { 619 const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
619 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>(); 620 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>();
620 621
621 uint32_t xKey = displacementMap.xChannelSelector(); 622 uint32_t xKey = displacementMap.xChannelSelector();
622 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s; 623 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s;
623 624
624 b->add32(xKey | yKey); 625 b->add32(xKey | yKey);
625 } 626 }
626 #endif 627 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698