diff options
| author |  Mike Reed <reed@google.com> | 2018-01-20 14:48:56 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-20 14:49:10 +0000 |
| commit | 3d628fe00a7d6cf4a375d758e7436f104d11417d (patch) | |
| tree | 2c0b1f495d3584104bff4a81bca2941f0047171a /src/gpu/GrTestUtils.cpp | |
| parent | faca00d9936fe74ddb0747625207ce534e8cf3fe (diff) | |
Revert "simplify GrFPArgs, isolating localmatrix"
This reverts commit b76c71702517643b5f6081991b376bbf73b34bde.
Reason for revert: try to unblock android roller
Original change's description:
> simplify GrFPArgs, isolating localmatrix
>
> Bug: skia:
> Change-Id: Icee24e0a355a7d1bae29b7721b4d95db8023ca77
> Reviewed-on: https://skia-review.googlesource.com/97063
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=bsalomon@google.com,reed@google.com
Change-Id: Ic7a2288844cde57922b2cc74b855eb517ade48be
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/97580
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/gpu/GrTestUtils.cpp')
| -rw-r--r-- | src/gpu/GrTestUtils.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/gpu/GrTestUtils.cpp b/src/gpu/GrTestUtils.cpp index 1918ad61f9..d5565ca828 100644 --- a/src/gpu/GrTestUtils.cpp +++ b/src/gpu/GrTestUtils.cpp @@ -334,13 +334,17 @@ sk_sp<GrColorSpaceXform> TestColorXform(SkRandom* random) { return gXforms[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gXforms)))]; } -TestAsFPArgs::TestAsFPArgs(GrProcessorTestData* d) - : fViewMatrixStorage(TestMatrix(d->fRandom)) - , fColorSpaceInfoStorage(skstd::make_unique<GrColorSpaceInfo>(TestColorSpace(d->fRandom), - kRGBA_8888_GrPixelConfig)) - , fArgs(d->context(), &fViewMatrixStorage, nullptr, kNone_SkFilterQuality, - fColorSpaceInfoStorage.get()) -{} +TestAsFPArgs::TestAsFPArgs(GrProcessorTestData* d) { + fViewMatrixStorage = TestMatrix(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.fDstColorSpaceInfo = fColorSpaceInfoStorage.get(); +} TestAsFPArgs::~TestAsFPArgs() {} |