From 0c78238e2991c95b6fb3c945d4ad2b5d941ae21b Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Thu, 7 Jun 2018 20:11:27 +0000 Subject: 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 > Commit-Queue: Greg Daniel 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 Commit-Queue: Greg Daniel --- tests/EGLImageTest.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/EGLImageTest.cpp') diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp index 94cbaf9c17..f2c73711e7 100644 --- a/tests/EGLImageTest.cpp +++ b/tests/EGLImageTest.cpp @@ -16,7 +16,6 @@ #include "GrTest.h" #include "GrTexture.h" #include "GrTextureContext.h" -#include "GrTexturePriv.h" #include "GrTextureProxyPriv.h" #include "gl/GLTestContext.h" #include "gl/GrGLGpu.h" @@ -167,9 +166,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) { } GrTextureProxy* proxy = surfaceContext->asTextureProxy(); - REPORTER_ASSERT(reporter, proxy->mipMapped() == GrMipMapped::kNo); - REPORTER_ASSERT(reporter, - proxy->priv().peekTexture()->texturePriv().mipMapped() == GrMipMapped::kNo); + REPORTER_ASSERT(reporter, proxy->texPriv().doesNotSupportMipMaps()); + REPORTER_ASSERT(reporter, proxy->priv().peekTexture()->surfacePriv().doesNotSupportMipMaps()); REPORTER_ASSERT(reporter, proxy->texPriv().isGLTextureRectangleOrExternal()); REPORTER_ASSERT(reporter, -- cgit v1.2.3