9eb36b9eb8
This reverts commit0c78238e29. 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 commitcd2c3f9055. > > 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>
58 lines
2.4 KiB
C++
58 lines
2.4 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkTypes.h"
|
|
|
|
#include "GrContext.h"
|
|
#include "GrTexturePriv.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkImage_Base.h"
|
|
#include "SkSurface.h"
|
|
#include "Test.h"
|
|
|
|
// Tests that MIP maps are created and invalidated as expected when drawing to and from GrTextures.
|
|
DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrTextureMipMapInvalidationTest, reporter, ctxInfo) {
|
|
auto isMipped = [] (SkSurface* surf) {
|
|
const GrTexture* texture = surf->makeImageSnapshot()->getTexture();
|
|
return GrMipMapped::kYes == texture->texturePriv().mipMapped();
|
|
};
|
|
|
|
auto mipsAreDirty = [] (SkSurface* surf) {
|
|
return surf->makeImageSnapshot()->getTexture()->texturePriv().mipMapsAreDirty();
|
|
};
|
|
|
|
GrContext* context = ctxInfo.grContext();
|
|
auto info = SkImageInfo::MakeN32Premul(256, 256);
|
|
for (auto allocateMips : {false, true}) {
|
|
auto surf1 = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info, 0,
|
|
kBottomLeft_GrSurfaceOrigin, nullptr,
|
|
allocateMips);
|
|
auto surf2 = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info);
|
|
// Draw something just in case we ever had a solid color optimization
|
|
surf1->getCanvas()->drawCircle(128, 128, 50, SkPaint());
|
|
surf1->getCanvas()->flush();
|
|
|
|
// No mipmaps initially
|
|
REPORTER_ASSERT(reporter, isMipped(surf1.get()) == allocateMips);
|
|
|
|
// Painting with downscale and medium filter quality should result in mipmap creation
|
|
SkPaint paint;
|
|
paint.setFilterQuality(kMedium_SkFilterQuality);
|
|
surf2->getCanvas()->scale(0.2f, 0.2f);
|
|
surf2->getCanvas()->drawImage(surf1->makeImageSnapshot(), 0, 0, &paint);
|
|
surf2->getCanvas()->flush();
|
|
REPORTER_ASSERT(reporter, isMipped(surf1.get()) == allocateMips);
|
|
REPORTER_ASSERT(reporter, !allocateMips || !mipsAreDirty(surf1.get()));
|
|
|
|
// Changing the contents of the surface should invalidate the mipmap, but not de-allocate
|
|
surf1->getCanvas()->drawCircle(128, 128, 100, SkPaint());
|
|
surf1->getCanvas()->flush();
|
|
REPORTER_ASSERT(reporter, isMipped(surf1.get()) == allocateMips);
|
|
REPORTER_ASSERT(reporter, mipsAreDirty(surf1.get()));
|
|
}
|
|
}
|