diff options
author | 2018-06-07 20:11:27 +0000 | |
---|---|---|
committer | 2018-06-07 20:11:33 +0000 | |
commit | 0c78238e2991c95b6fb3c945d4ad2b5d941ae21b (patch) | |
tree | 4810fb4c78687a0100b847188ab27c804fcd1d56 /src/gpu/gl/GrGLGpu.cpp | |
parent | 1bd4b31d1d56533686c3ab9ee1c4cbbb1978d4e3 (diff) |
Revert "Require mips to be allocated at texture creation time and disable late allocations."
This reverts commit cd2c3f9055452d413d6be7ea6dc63fd1922fe994.
Reason for revert: Looks to be causing angle failures on initial clear test
Original change's description:
> Require mips to be allocated at texture creation time and disable late allocations.
>
> If we get a non-mipped texture for a draw that wants to be use mip map filter, we
> will copy the texture into a new mipped texture.
>
> Clean up of unused code in the GPU backends for reallocating for mips will be done
> in a follow up CL.
>
> Bug: skia:
> Change-Id: Idab588c1abf4bbbf7eeceb3727d500e5df274188
> Reviewed-on: https://skia-review.googlesource.com/132830
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I49f0ace52f2586d61b451630b2e6aae84b420b81
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/133041
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 214bb70ae7..b0b55e51f8 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -2854,8 +2854,6 @@ void GrGLGpu::generateMipmaps(const GrSamplerState& params, GrGLTexture* texture return; } - SkASSERT(texture->texturePriv().mipMapped() == GrMipMapped::kYes); - // If the mips aren't dirty, we're done: if (!texture->texturePriv().mipMapsAreDirty()) { return; |