diff options
author | Greg Daniel <egdaniel@google.com> | 2018-06-07 15:07:50 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-07 19:35:01 +0000 |
commit | cd2c3f9055452d413d6be7ea6dc63fd1922fe994 (patch) | |
tree | f5040726b08c094f547a85b957814e561b5ba550 /tests/RectangleTextureTest.cpp | |
parent | c174cc675cbc190c43372d53fb89711663ac945f (diff) |
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>
Diffstat (limited to 'tests/RectangleTextureTest.cpp')
-rw-r--r-- | tests/RectangleTextureTest.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp index 3516acf339..90b723a3eb 100644 --- a/tests/RectangleTextureTest.cpp +++ b/tests/RectangleTextureTest.cpp @@ -15,6 +15,7 @@ #include "GrRenderTargetContext.h" #include "GrSurfacePriv.h" #include "GrTest.h" +#include "GrTexturePriv.h" #include "GrTextureProxyPriv.h" #include "gl/GLTestContext.h" #include "gl/GrGLGpu.h" @@ -136,8 +137,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(RectangleTexture, reporter, ctxInfo) { continue; } - SkASSERT(rectProxy->texPriv().doesNotSupportMipMaps()); - SkASSERT(rectProxy->priv().peekTexture()->surfacePriv().doesNotSupportMipMaps()); + SkASSERT(rectProxy->mipMapped() == GrMipMapped::kNo); + SkASSERT(rectProxy->priv().peekTexture()->texturePriv().mipMapped() == GrMipMapped::kNo); SkASSERT(rectProxy->texPriv().isGLTextureRectangleOrExternal()); SkASSERT(rectProxy->priv().peekTexture()->surfacePriv().isGLTextureRectangleOrExternal()); |