diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-10-25 15:12:19 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-25 19:32:20 +0000 |
| commit | 4cbb6e6d551e8bea2c040b1aa9dce253cffb9af0 (patch) | |
| tree | a93401716e0f5d45760da36b49c8cf8ea8e1cc21 /src/gpu/GrTestUtils.cpp | |
| parent | 291af4f17e0630f78a8c4d22f304243fb28ae42b (diff) | |
Pass GrRenderTargetContext's GrColorSpaceInfo to SkShader and SkColorFilter.
Also to SkColorTo(Premul|Unpremul)GrColor4f.
This can avoid cache lookups to find GrColorSpaceXforms as the xform pointer is stored in GrColorSpaceInfo after the first lookup.
Also uses GrColorSpaceInfo to construct GrTextUtils::Paint.
Bug: skia:
Change-Id: Idf19d512a60d2269e6921c7fb54d93aee499a70d
Reviewed-on: https://skia-review.googlesource.com/63660
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/GrTestUtils.cpp')
| -rw-r--r-- | src/gpu/GrTestUtils.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gpu/GrTestUtils.cpp b/src/gpu/GrTestUtils.cpp index 901fe4d1fb..da3cb97dfe 100644 --- a/src/gpu/GrTestUtils.cpp +++ b/src/gpu/GrTestUtils.cpp @@ -6,11 +6,12 @@ */ #include "GrTestUtils.h" -#include "GrColorSpaceXform.h" +#include "GrColorSpaceInfo.h" #include "GrProcessorUnitTest.h" #include "GrStyle.h" #include "SkColorSpace_Base.h" #include "SkDashPathPriv.h" +#include "SkMakeUnique.h" #include "SkMatrix.h" #include "SkPath.h" #include "SkRRect.h" @@ -334,15 +335,18 @@ sk_sp<GrColorSpaceXform> TestColorXform(SkRandom* random) { TestAsFPArgs::TestAsFPArgs(GrProcessorTestData* d) { fViewMatrixStorage = TestMatrix(d->fRandom); - fColorSpaceStorage = TestColorSpace(d->fRandom); + fColorSpaceInfoStorage = skstd::make_unique<GrColorSpaceInfo>(TestColorSpace(d->fRandom), + kRGBA_8888_GrPixelConfig); fArgs.fContext = d->context(); fArgs.fViewMatrix = &fViewMatrixStorage; fArgs.fLocalMatrix = nullptr; fArgs.fFilterQuality = kNone_SkFilterQuality; - fArgs.fDstColorSpace = fColorSpaceStorage.get(); + fArgs.fDstColorSpaceInfo = fColorSpaceInfoStorage.get(); } +TestAsFPArgs::~TestAsFPArgs() {} + } // namespace GrTest #endif |