diff options
author | brianosman <brianosman@google.com> | 2016-06-22 07:10:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-22 07:10:06 -0700 |
commit | 6efeda4838f5944e4e14ff156be5593aa59cf1aa (patch) | |
tree | 9cb0e77f479fb054345f035495d4cbbf7332a3ba /include | |
parent | b105cff6e21afeb0f6357d63f695957fbb640694 (diff) |
Revert of Store mipmap levels in deferred texture image (patchset #15 id:280001 of https://codereview.chromium.org/2034933003/ )
Reason for revert:
Crashes on a few different bots (including ASAN). Examples:
https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/builds/6324
https://build.chromium.org/p/client.skia/builders/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug/builds/5400
https://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Debug-ASAN/builds/3539
Original issue's description:
> Store mipmap levels in deferred texture image
>
> 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
> R=bsalomon@google.com
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2034933003
>
> Committed: https://skia.googlesource.com/skia/+/b3105190a6e02d37f1d7f07a3a8bdd368ec7f157
TBR=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/2083393002
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkImage.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h index b373e30fa7..c9c5668460 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -384,9 +384,7 @@ public: size_t getDeferredTextureImageData(const GrContextThreadSafeProxy&, const DeferredTextureImageUsageParams[], int paramCnt, - void* buffer, - SkSourceGammaTreatment treatment = - SkSourceGammaTreatment::kIgnore) const; + void* buffer) const; /** * Returns a texture-backed image from data produced in SkImage::getDeferredTextureImageData. @@ -461,7 +459,7 @@ protected: private: static sk_sp<SkImage> MakeTextureFromMipMap(GrContext*, const SkImageInfo&, const GrMipLevel* texels, int mipLevelCount, - SkBudgeted, SkSourceGammaTreatment); + SkBudgeted); const int fWidth; const int fHeight; |