From 9eb36b9eb8e81e970e02fa985ae82fe64de0a8f0 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Fri, 8 Jun 2018 13:02:22 -0400 Subject: Reland "Require mips to be allocated at texture creation time and disable late allocations." This reverts commit 0c78238e2991c95b6fb3c945d4ad2b5d941ae21b. Reason for revert: 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 > > Commit-Queue: Greg Daniel > > > > 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 Bug: skia: Change-Id: I004447a5f1ec72c3be2318ddea803f57efb12ea4 Reviewed-on: https://skia-review.googlesource.com/133340 Reviewed-by: Brian Salomon Commit-Queue: Greg Daniel --- src/gpu/GrBackendTextureImageGenerator.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/gpu/GrBackendTextureImageGenerator.cpp') diff --git a/src/gpu/GrBackendTextureImageGenerator.cpp b/src/gpu/GrBackendTextureImageGenerator.cpp index 56826d2857..4147abd2a4 100644 --- a/src/gpu/GrBackendTextureImageGenerator.cpp +++ b/src/gpu/GrBackendTextureImageGenerator.cpp @@ -180,12 +180,6 @@ sk_sp GrBackendTextureImageGenerator::onGenerateTexture( return nullptr; } - // We can't pass the fact that this creates a wrapped texture into createLazyProxy so we need - // to manually call setDoesNotSupportMipMaps. - if (GrMipMapped::kNo == mipMapped) { - proxy->texPriv().setDoesNotSupportMipMaps(); - } - if (0 == origin.fX && 0 == origin.fY && info.width() == fBackendTexture.width() && info.height() == fBackendTexture.height() && (!willNeedMipMaps || GrMipMapped::kYes == proxy->mipMapped())) { -- cgit v1.2.3