diff options
author | 2018-06-08 13:02:22 -0400 | |
---|---|---|
committer | 2018-06-08 17:39:33 +0000 | |
commit | 9eb36b9eb8e81e970e02fa985ae82fe64de0a8f0 (patch) | |
tree | d1559a2b142f2cc1e07498a1320d7be9c1961042 /src/gpu/GrTextureProxyPriv.h | |
parent | fff19667cc5c0157335144bee69418d56a4fad4b (diff) |
Reland "Require mips to be allocated at texture creation time and disable late allocations."
This reverts commit 0c78238e2991c95b6fb3c945d4ad2b5d941ae21b.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> 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>
>
>
>
> 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>
Bug: skia:
Change-Id: I004447a5f1ec72c3be2318ddea803f57efb12ea4
Reviewed-on: https://skia-review.googlesource.com/133340
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrTextureProxyPriv.h')
-rw-r--r-- | src/gpu/GrTextureProxyPriv.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gpu/GrTextureProxyPriv.h b/src/gpu/GrTextureProxyPriv.h index cadd2fde63..358369d516 100644 --- a/src/gpu/GrTextureProxyPriv.h +++ b/src/gpu/GrTextureProxyPriv.h @@ -31,7 +31,6 @@ public: // been instantiated or not. GrMipMapped proxyMipMapped() const { return fTextureProxy->fMipMapped; } - bool doesNotSupportMipMaps() const { return fTextureProxy->doesNotSupportMipMaps(); } bool isGLTextureRectangleOrExternal() const { return fTextureProxy->isGLTextureRectangleOrExternal(); } @@ -41,10 +40,6 @@ public: // We only support the clamp wrap mode with gl rectangle or external textures. bool isClampOnly() const { return fTextureProxy->isGLTextureRectangleOrExternal(); } - void setDoesNotSupportMipMaps() { - fTextureProxy->setDoesNotSupportMipMaps(); - } - private: explicit GrTextureProxyPriv(GrTextureProxy* textureProxy) : fTextureProxy(textureProxy) {} GrTextureProxyPriv(const GrTextureProxyPriv&) {} // unimpl |