From cd2c3f9055452d413d6be7ea6dc63fd1922fe994 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Thu, 7 Jun 2018 15:07:50 -0400 Subject: 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 Commit-Queue: Greg Daniel --- tests/RectangleTextureTest.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/RectangleTextureTest.cpp') 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()); -- cgit v1.2.3