aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gpu/GrTextureAdjuster.cpp6
-rw-r--r--src/gpu/GrTextureAdjuster.h2
-rw-r--r--src/gpu/GrTextureMaker.cpp6
-rw-r--r--src/gpu/GrTextureMaker.h6
-rw-r--r--src/gpu/GrTextureProducer.cpp25
-rw-r--r--src/gpu/GrTextureProducer.h8
-rw-r--r--src/gpu/vk/GrVkGpuCommandBuffer.cpp3
-rw-r--r--tests/GrMipMappedTest.cpp37
8 files changed, 74 insertions, 19 deletions
diff --git a/src/gpu/GrTextureAdjuster.cpp b/src/gpu/GrTextureAdjuster.cpp
index d016896c3f..b2fc0584ba 100644
--- a/src/gpu/GrTextureAdjuster.cpp
+++ b/src/gpu/GrTextureAdjuster.cpp
@@ -17,9 +17,8 @@ GrTextureAdjuster::GrTextureAdjuster(GrContext* context, sk_sp<GrTextureProxy> o
SkAlphaType alphaType,
uint32_t uniqueID,
SkColorSpace* cs)
- : INHERITED(original->width(), original->height(),
+ : INHERITED(context, original->width(), original->height(),
GrPixelConfigIsAlphaOnly(original->config()))
- , fContext(context)
, fOriginal(std::move(original))
, fAlphaType(alphaType)
, fColorSpace(cs)
@@ -77,6 +76,7 @@ sk_sp<GrTextureProxy> GrTextureAdjuster::onRefTextureProxyForParams(
const GrSamplerState& params,
SkColorSpace* dstColorSpace,
sk_sp<SkColorSpace>* texColorSpace,
+ bool willBeMipped,
SkScalar scaleAdjust[2]) {
sk_sp<GrTextureProxy> proxy = this->originalProxyRef();
CopyParams copyParams;
@@ -105,8 +105,6 @@ sk_sp<GrTextureProxy> GrTextureAdjuster::onRefTextureProxyForParams(
}
}
- bool willBeMipped = GrSamplerState::Filter::kMipMap == params.filter() &&
- fContext->contextPriv().caps()->mipMapSupport();
sk_sp<GrTextureProxy> result = this->refTextureProxyCopy(copyParams, willBeMipped);
if (!result && needsCopyForMipsOnly) {
// If we were unable to make a copy and we only needed a copy for mips, then we will return
diff --git a/src/gpu/GrTextureAdjuster.h b/src/gpu/GrTextureAdjuster.h
index e43e87b1dc..ad02ae06c8 100644
--- a/src/gpu/GrTextureAdjuster.h
+++ b/src/gpu/GrTextureAdjuster.h
@@ -46,11 +46,11 @@ private:
sk_sp<GrTextureProxy> onRefTextureProxyForParams(const GrSamplerState&,
SkColorSpace* dstColorSpace,
sk_sp<SkColorSpace>* proxyColorSpace,
+ bool willBeMipped,
SkScalar scaleAdjust[2]) override;
sk_sp<GrTextureProxy> refTextureProxyCopy(const CopyParams& copyParams, bool willBeMipped);
- GrContext* fContext;
sk_sp<GrTextureProxy> fOriginal;
SkAlphaType fAlphaType;
SkColorSpace* fColorSpace;
diff --git a/src/gpu/GrTextureMaker.cpp b/src/gpu/GrTextureMaker.cpp
index 22870cc7c8..820e47ab7c 100644
--- a/src/gpu/GrTextureMaker.cpp
+++ b/src/gpu/GrTextureMaker.cpp
@@ -16,6 +16,7 @@
sk_sp<GrTextureProxy> GrTextureMaker::onRefTextureProxyForParams(const GrSamplerState& params,
SkColorSpace* dstColorSpace,
sk_sp<SkColorSpace>* texColorSpace,
+ bool willBeMipped,
SkScalar scaleAdjust[2]) {
if (this->width() > fContext->contextPriv().caps()->maxTextureSize() ||
this->height() > fContext->contextPriv().caps()->maxTextureSize()) {
@@ -23,11 +24,6 @@ sk_sp<GrTextureProxy> GrTextureMaker::onRefTextureProxyForParams(const GrSampler
}
CopyParams copyParams;
- bool willBeMipped = params.filter() == GrSamplerState::Filter::kMipMap;
-
- if (!fContext->contextPriv().caps()->mipMapSupport()) {
- willBeMipped = false;
- }
if (texColorSpace) {
*texColorSpace = this->getColorSpace(dstColorSpace);
diff --git a/src/gpu/GrTextureMaker.h b/src/gpu/GrTextureMaker.h
index a365b50444..e2dd3c852a 100644
--- a/src/gpu/GrTextureMaker.h
+++ b/src/gpu/GrTextureMaker.h
@@ -28,8 +28,7 @@ public:
protected:
GrTextureMaker(GrContext* context, int width, int height, bool isAlphaOnly)
- : INHERITED(width, height, isAlphaOnly)
- , fContext(context) {}
+ : INHERITED(context, width, height, isAlphaOnly) {}
/**
* Return the maker's "original" texture. It is the responsibility of the maker to handle any
@@ -54,10 +53,9 @@ private:
sk_sp<GrTextureProxy> onRefTextureProxyForParams(const GrSamplerState&,
SkColorSpace* dstColorSpace,
sk_sp<SkColorSpace>* proxyColorSpace,
+ bool willBeMipped,
SkScalar scaleAdjust[2]) override;
- GrContext* fContext;
-
typedef GrTextureProducer INHERITED;
};
diff --git a/src/gpu/GrTextureProducer.cpp b/src/gpu/GrTextureProducer.cpp
index 59962c55b1..cdf2a476e3 100644
--- a/src/gpu/GrTextureProducer.cpp
+++ b/src/gpu/GrTextureProducer.cpp
@@ -11,6 +11,7 @@
#include "GrRenderTargetContext.h"
#include "GrTextureProxy.h"
#include "SkGr.h"
+#include "SkMipMap.h"
#include "SkRectPriv.h"
#include "effects/GrBicubicEffect.h"
#include "effects/GrSimpleTextureEffect.h"
@@ -226,8 +227,18 @@ sk_sp<GrTextureProxy> GrTextureProducer::refTextureProxyForParams(
SkDEBUGCODE(bool expectNoScale = (sampler.filter() != GrSamplerState::Filter::kMipMap &&
!sampler.isRepeated()));
SkASSERT(scaleAdjust || expectNoScale);
+
+ int mipCount = SkMipMap::ComputeLevelCount(this->width(), this->height());
+ bool willBeMipped = GrSamplerState::Filter::kMipMap == sampler.filter() && mipCount &&
+ fContext->contextPriv().caps()->mipMapSupport();
+
auto result =
- this->onRefTextureProxyForParams(sampler, dstColorSpace, proxyColorSpace, scaleAdjust);
+ this->onRefTextureProxyForParams(sampler, dstColorSpace, proxyColorSpace, willBeMipped,
+ scaleAdjust);
+
+ // Check to make sure that if we say the texture willBeMipped that the returned texture has mip
+ // maps.
+ SkASSERT(!result || !willBeMipped || result->mipMapped() == GrMipMapped::kYes);
// Check that the "no scaling expected" case always returns a proxy of the same size as the
// producer.
@@ -243,8 +254,18 @@ sk_sp<GrTextureProxy> GrTextureProducer::refTextureProxy(GrMipMapped willNeedMip
GrMipMapped::kNo == willNeedMips ? GrSamplerState::Filter::kNearest
: GrSamplerState::Filter::kMipMap;
GrSamplerState sampler(GrSamplerState::WrapMode::kClamp, filter);
+
+ int mipCount = SkMipMap::ComputeLevelCount(this->width(), this->height());
+ bool willBeMipped = GrSamplerState::Filter::kMipMap == sampler.filter() && mipCount &&
+ fContext->contextPriv().caps()->mipMapSupport();
+
auto result =
- this->onRefTextureProxyForParams(sampler, dstColorSpace, proxyColorSpace, nullptr);
+ this->onRefTextureProxyForParams(sampler, dstColorSpace, proxyColorSpace,
+ willBeMipped, nullptr);
+
+ // Check to make sure that if we say the texture willBeMipped that the returned texture has mip
+ // maps.
+ SkASSERT(!result || !willBeMipped || result->mipMapped() == GrMipMapped::kYes);
// Check that no scaling occured and we returned a proxy of the same size as the producer.
SkASSERT(!result || (result->width() == this->width() && result->height() == this->height()));
diff --git a/src/gpu/GrTextureProducer.h b/src/gpu/GrTextureProducer.h
index b42bbcfc9a..66adb6fa4e 100644
--- a/src/gpu/GrTextureProducer.h
+++ b/src/gpu/GrTextureProducer.h
@@ -124,8 +124,9 @@ public:
protected:
friend class GrTextureProducer_TestAccess;
- GrTextureProducer(int width, int height, bool isAlphaOnly)
- : fWidth(width)
+ GrTextureProducer(GrContext* context, int width, int height, bool isAlphaOnly)
+ : fContext(context)
+ , fWidth(width)
, fHeight(height)
, fIsAlphaOnly(isAlphaOnly) {}
@@ -185,10 +186,13 @@ protected:
const SkRect& domain,
const GrSamplerState::Filter* filterOrNullForBicubic);
+ GrContext* fContext;
+
private:
virtual sk_sp<GrTextureProxy> onRefTextureProxyForParams(const GrSamplerState&,
SkColorSpace* dstColorSpace,
sk_sp<SkColorSpace>* proxyColorSpace,
+ bool willBeMipped,
SkScalar scaleAdjust[2]) = 0;
const int fWidth;
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
index 91adb5a778..d58a8b5ff7 100644
--- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp
+++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
@@ -622,7 +622,8 @@ static void prepare_sampled_images(const GrResourceIOProcessor& processor,
}
// Check if we need to regenerate any mip maps
- if (GrSamplerState::Filter::kMipMap == sampler.samplerState().filter()) {
+ if (GrSamplerState::Filter::kMipMap == sampler.samplerState().filter() &&
+ (vkTexture->width() != 1 || vkTexture->height() != 1)) {
SkASSERT(vkTexture->texturePriv().mipMapped() == GrMipMapped::kYes);
if (vkTexture->texturePriv().mipMapsAreDirty()) {
gpu->regenerateMipMapLevels(vkTexture);
diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp
index 3c47598e38..ee4838d2ce 100644
--- a/tests/GrMipMappedTest.cpp
+++ b/tests/GrMipMappedTest.cpp
@@ -289,3 +289,40 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrImageSnapshotMipMappedTest, reporter, ctxIn
}
}
}
+
+// Test that we don't create a mip mapped texture if the size is 1x1 even if the filter mode is set
+// to use mips. This test passes by not crashing or hitting asserts in code.
+DEF_GPUTEST_FOR_RENDERING_CONTEXTS(Gr1x1TextureMipMappedTest, reporter, ctxInfo) {
+ GrContext* context = ctxInfo.grContext();
+ if (!context->contextPriv().caps()->mipMapSupport()) {
+ return;
+ }
+
+ // Make surface to draw into
+ SkImageInfo info = SkImageInfo::MakeN32(16, 16, kPremul_SkAlphaType);
+ sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info);
+
+ // Make 1x1 raster bitmap
+ SkBitmap bmp;
+ bmp.allocN32Pixels(1, 1);
+ SkPMColor* pixel = reinterpret_cast<SkPMColor*>(bmp.getPixels());
+ *pixel = 0;
+
+ sk_sp<SkImage> bmpImage = SkImage::MakeFromBitmap(bmp);
+
+ // Make sure we scale so we don't optimize out the use of mips.
+ surface->getCanvas()->scale(0.5f, 0.5f);
+
+ SkPaint paint;
+ // This should upload the image to a non mipped GrTextureProxy.
+ surface->getCanvas()->drawImage(bmpImage, 0, 0, &paint);
+ surface->flush();
+
+ // Now set the filter quality to high so we use mip maps. We should find the non mipped texture
+ // in the cache for the SkImage. Since the texture is 1x1 we should just use that texture
+ // instead of trying to do a copy to a mipped texture.
+ paint.setFilterQuality(kHigh_SkFilterQuality);
+ surface->getCanvas()->drawImage(bmpImage, 0, 0, &paint);
+ surface->flush();
+}
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 03:23:51 +0000