skia2/gm/makeRasterImage.cpp

17 lines
389 B
C++
Raw Normal View History

Revert "Revert "fix legacy makeRasterImage()"" This reverts commit ef29e42ef3d81a0e704cf0efcfc9937b531f0327. Reason for revert: probably not either roll. Original change's description: > Revert "fix legacy makeRasterImage()" > > This reverts commit 7c4ca043361f6adb3d17a9d3db2397d86bac5a2d. > > Reason for revert: layout, cereal tests? > > Original change's description: > > fix legacy makeRasterImage() > > > > Passing the color space down into SkImage_Lazy ends up triggering a > > SkTransferFunctionBehavior::kRespect decode (tf(r*a)), where we want > > ignore (tf(r)*a) to have any hope of working with the legacy backend. > > > > This fix in turn needs another little extension of another old hack in > > SkImage_Gpu for makeNonTextureImage() to keep working there. > > > > Bug: skia:7479 > > > > Change-Id: If48ca68e95d9eee597f6b10434498049981314ba > > Reviewed-on: https://skia-review.googlesource.com/93380 > > Commit-Queue: Mike Klein <mtklein@chromium.org> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=mtklein@chromium.org,brianosman@google.com > > Change-Id: I65092e01d767ef1fd35563f0b79ceded3c12b267 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:7479 > Reviewed-on: https://skia-review.googlesource.com/93820 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@chromium.org,mtklein@google.com,brianosman@google.com Change-Id: Ic9b48d311cca152ab2e620363dd4528ed382eb88 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7479 Reviewed-on: https://skia-review.googlesource.com/93960 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2018-01-12 15:59:53 +00:00
/*
* Copyright 2018 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "Resources.h"
#include "SkSurface.h"
#include "gm.h"
DEF_SIMPLE_GM(makeRasterImage, canvas, 128,128) {
if (auto img = GetResourceAsImage("images/color_wheel.png")) {
canvas->drawImage(img->makeRasterImage(), 0,0);
}
Revert "Revert "fix legacy makeRasterImage()"" This reverts commit ef29e42ef3d81a0e704cf0efcfc9937b531f0327. Reason for revert: probably not either roll. Original change's description: > Revert "fix legacy makeRasterImage()" > > This reverts commit 7c4ca043361f6adb3d17a9d3db2397d86bac5a2d. > > Reason for revert: layout, cereal tests? > > Original change's description: > > fix legacy makeRasterImage() > > > > Passing the color space down into SkImage_Lazy ends up triggering a > > SkTransferFunctionBehavior::kRespect decode (tf(r*a)), where we want > > ignore (tf(r)*a) to have any hope of working with the legacy backend. > > > > This fix in turn needs another little extension of another old hack in > > SkImage_Gpu for makeNonTextureImage() to keep working there. > > > > Bug: skia:7479 > > > > Change-Id: If48ca68e95d9eee597f6b10434498049981314ba > > Reviewed-on: https://skia-review.googlesource.com/93380 > > Commit-Queue: Mike Klein <mtklein@chromium.org> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=mtklein@chromium.org,brianosman@google.com > > Change-Id: I65092e01d767ef1fd35563f0b79ceded3c12b267 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:7479 > Reviewed-on: https://skia-review.googlesource.com/93820 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@chromium.org,mtklein@google.com,brianosman@google.com Change-Id: Ic9b48d311cca152ab2e620363dd4528ed382eb88 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7479 Reviewed-on: https://skia-review.googlesource.com/93960 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2018-01-12 15:59:53 +00:00
}