diff options
| author |  halcanary <halcanary@google.com> | 2016-08-09 17:46:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-09 17:46:25 -0700 |
| commit | e9d55c57a6537108ddebdc7afe2b92b4d83426be (patch) | |
| tree | cdd9c98d2e3f2f9e147c169d0976a68ea423ac42 /tests/ImageTest.cpp | |
| parent | cd8864111d191be4db42a478d6bf877eb50277a7 (diff) | |
Revert of Store mipmap levels in deferred texture image (patchset #11 id:200001 of https://codereview.chromium.org/2115023002/ )
Reason for revert:
speculative revert: android dm crashes
Original issue's description:
> Store mipmap levels in deferred texture image
>
> This is a follow-up to https://codereview.chromium.org/2034933003/ which
> was reverted due to a memory leak.
>
> When creating the deferred texture image, detect if using medium / high
> quality. If so, generate and store mipmaps in the deferred texture
> image.
>
> When creating a texture from that be sure to read it back out.
>
> BUG=578304
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2115023002
>
> Committed: https://skia.googlesource.com/skia/+/d6113140f7ae8996f679ac6698a60fb8c1386da3
TBR=brianosman@google.com,bsalomon@google.com,ericrk@chromium.org,cblume@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=578304
Review-Url: https://codereview.chromium.org/2227323002
Diffstat (limited to 'tests/ImageTest.cpp')
| -rw-r--r-- | tests/ImageTest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index b24ded0fb3..ca4788c449 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -921,7 +921,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredTextureImage, reporter, ctxInfo) { sk_sp<SkImage> image(testCase.fImageFactory()); size_t size = image->getDeferredTextureImageData(*proxy, testCase.fParams.data(), static_cast<int>(testCase.fParams.size()), - nullptr, SkSourceGammaTreatment::kIgnore); + nullptr); + static const char *const kFS[] = { "fail", "succeed" }; if (SkToBool(size) != testCase.fExpectation) { ERRORF(reporter, "This image was expected to %s but did not.", @@ -932,12 +933,12 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredTextureImage, reporter, ctxInfo) { void* misaligned = reinterpret_cast<void*>(reinterpret_cast<intptr_t>(buffer) + 3); if (image->getDeferredTextureImageData(*proxy, testCase.fParams.data(), static_cast<int>(testCase.fParams.size()), - misaligned, SkSourceGammaTreatment::kIgnore)) { + misaligned)) { ERRORF(reporter, "Should fail when buffer is misaligned."); } if (!image->getDeferredTextureImageData(*proxy, testCase.fParams.data(), static_cast<int>(testCase.fParams.size()), - buffer, SkSourceGammaTreatment::kIgnore)) { + buffer)) { ERRORF(reporter, "deferred image size succeeded but creation failed."); } else { for (auto budgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) { |