Rename GrMipMapped GrMipmapped
Change-Id: Ia2cfbca8982b57399b6681cbb4501c2933ab4df7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304576
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/core/SkDeferredDisplayListRecorder.cpp b/src/core/SkDeferredDisplayListRecorder.cpp
index 3deee67..2e6ac52 100644
--- a/src/core/SkDeferredDisplayListRecorder.cpp
+++ b/src/core/SkDeferredDisplayListRecorder.cpp
@@ -27,7 +27,7 @@
const GrBackendFormat& backendFormat,
int width,
int height,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrSurfaceOrigin origin,
SkColorType colorType,
SkAlphaType alphaType,
@@ -147,8 +147,8 @@
fCharacterization.isTextureable()) {
surfaceFlags |= GrInternalSurfaceFlags::kRequiresManualMSAAResolve;
}
- // FIXME: Why do we use GrMipMapped::kNo instead of SkSurfaceCharacterization::fIsMipMapped?
- static constexpr GrProxyProvider::TextureInfo kTextureInfo{GrMipMapped::kNo,
+ // FIXME: Why do we use GrMipmapped::kNo instead of SkSurfaceCharacterization::fIsMipMapped?
+ static constexpr GrProxyProvider::TextureInfo kTextureInfo{GrMipmapped::kNo,
GrTextureType::k2D};
const GrProxyProvider::TextureInfo* optionalTextureInfo = nullptr;
if (fCharacterization.isTextureable()) {
@@ -235,7 +235,7 @@
const GrBackendFormat& backendFormat,
int width,
int height,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrSurfaceOrigin origin,
SkColorType colorType,
SkAlphaType alphaType,
diff --git a/src/core/SkGpuBlurUtils.cpp b/src/core/SkGpuBlurUtils.cpp
index a3fa843..10fa9ff 100644
--- a/src/core/SkGpuBlurUtils.cpp
+++ b/src/core/SkGpuBlurUtils.cpp
@@ -69,7 +69,7 @@
SkBackingFit dstFit) {
auto renderTargetContext = GrRenderTargetContext::Make(
context, srcColorType, std::move(finalCS), dstFit, dstBounds.size(), 1,
- GrMipMapped::kNo, srcView.proxy()->isProtected(), srcView.origin());
+ GrMipmapped::kNo, srcView.proxy()->isProtected(), srcView.origin());
if (!renderTargetContext) {
return nullptr;
}
@@ -110,7 +110,7 @@
// and then capturing the 'dstBounds' portion in a new RTC where the top left of 'dstBounds' is
// at {0, 0} in the new RTC.
auto dstRenderTargetContext = GrRenderTargetContext::Make(
- context, srcColorType, std::move(finalCS), fit, dstBounds.size(), 1, GrMipMapped::kNo,
+ context, srcColorType, std::move(finalCS), fit, dstBounds.size(), 1, GrMipmapped::kNo,
srcView.proxy()->isProtected(), srcView.origin());
if (!dstRenderTargetContext) {
return nullptr;
@@ -258,7 +258,7 @@
src.reset(); // no longer needed
auto dstRenderTargetContext = GrRenderTargetContext::Make(
- context, srcColorType, std::move(colorSpace), fit, dstSize, 1, GrMipMapped::kNo,
+ context, srcColorType, std::move(colorSpace), fit, dstSize, 1, GrMipmapped::kNo,
srcView.proxy()->isProtected(), srcView.origin());
if (!dstRenderTargetContext) {
return nullptr;
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index ca3c918..dc61af0 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -570,7 +570,7 @@
auto renderTargetContext = GrRenderTargetContext::Make(
context, SkColorTypeToGrColorType(colorType), sk_ref_sp(colorSpace),
- SkBackingFit::kApprox, bounds.size(), 1, GrMipMapped::kNo, isProtected,
+ SkBackingFit::kApprox, bounds.size(), 1, GrMipmapped::kNo, isProtected,
kBottomLeft_GrSurfaceOrigin);
if (!renderTargetContext) {
return nullptr;
diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index 9eec074..f0ef60e 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -79,7 +79,7 @@
GrSurfaceProxyView SkImageGenerator::generateTexture(GrRecordingContext* ctx,
const SkImageInfo& info,
const SkIPoint& origin,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrImageTexGenPolicy texGenPolicy) {
SkIRect srcRect = SkIRect::MakeXYWH(origin.x(), origin.y(), info.width(), info.height());
if (!SkIRect::MakeWH(fInfo.width(), fInfo.height()).contains(srcRect)) {
@@ -91,7 +91,7 @@
GrSurfaceProxyView SkImageGenerator::onGenerateTexture(GrRecordingContext*,
const SkImageInfo&,
const SkIPoint&,
- GrMipMapped,
+ GrMipmapped,
GrImageTexGenPolicy) {
return {};
}
diff --git a/src/core/SkLegacyGpuBlurUtils.cpp b/src/core/SkLegacyGpuBlurUtils.cpp
index e269e18..1ce4010 100644
--- a/src/core/SkLegacyGpuBlurUtils.cpp
+++ b/src/core/SkLegacyGpuBlurUtils.cpp
@@ -117,7 +117,7 @@
SkBackingFit dstFit) {
auto renderTargetContext = GrRenderTargetContext::Make(
context, srcColorType, std::move(finalCS), dstFit, dstBounds.size(), 1,
- GrMipMapped::kNo, srcView.proxy()->isProtected(), srcView.origin());
+ GrMipmapped::kNo, srcView.proxy()->isProtected(), srcView.origin());
if (!renderTargetContext) {
return nullptr;
}
@@ -158,7 +158,7 @@
// and then capturing the 'dstBounds' portion in a new RTC where the top left of 'dstBounds' is
// at {0, 0} in the new RTC.
auto dstRenderTargetContext = GrRenderTargetContext::Make(
- context, srcColorType, std::move(finalCS), fit, dstBounds.size(), 1, GrMipMapped::kNo,
+ context, srcColorType, std::move(finalCS), fit, dstBounds.size(), 1, GrMipmapped::kNo,
srcView.proxy()->isProtected(), srcView.origin());
if (!dstRenderTargetContext) {
return nullptr;
@@ -294,7 +294,7 @@
dstRenderTargetContext = GrRenderTargetContext::Make(
context, srcColorType, finalCS, SkBackingFit::kApprox,
- {dstRect.fRight, dstRect.fBottom}, 1, GrMipMapped::kNo,
+ {dstRect.fRight, dstRect.fBottom}, 1, GrMipmapped::kNo,
srcView.proxy()->isProtected(), srcView.origin());
if (!dstRenderTargetContext) {
return {};
@@ -359,7 +359,7 @@
src.reset(); // no longer needed
auto dstRenderTargetContext = GrRenderTargetContext::Make(
- context, srcColorType, std::move(colorSpace), fit, dstSize, 1, GrMipMapped::kNo,
+ context, srcColorType, std::move(colorSpace), fit, dstSize, 1, GrMipmapped::kNo,
srcView.proxy()->isProtected(), srcView.origin());
if (!dstRenderTargetContext) {
return nullptr;
diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp
index 3601240..24c46fe 100644
--- a/src/core/SkPictureImageGenerator.cpp
+++ b/src/core/SkPictureImageGenerator.cpp
@@ -26,7 +26,7 @@
#if SK_SUPPORT_GPU
GrSurfaceProxyView onGenerateTexture(GrRecordingContext*, const SkImageInfo&, const SkIPoint&,
- GrMipMapped, GrImageTexGenPolicy) override;
+ GrMipmapped, GrImageTexGenPolicy) override;
#endif
private:
@@ -97,7 +97,7 @@
GrSurfaceProxyView SkPictureImageGenerator::onGenerateTexture(GrRecordingContext* ctx,
const SkImageInfo& info,
const SkIPoint& origin,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrImageTexGenPolicy texGenPolicy) {
SkASSERT(ctx);
@@ -108,7 +108,7 @@
: SkBudgeted::kYes;
auto surface = SkSurface::MakeRenderTarget(ctx, budgeted, info, 0,
kTopLeft_GrSurfaceOrigin, &props,
- mipMapped == GrMipMapped::kYes);
+ mipMapped == GrMipmapped::kYes);
if (!surface) {
return {};
}
@@ -123,8 +123,8 @@
}
const GrSurfaceProxyView* view = as_IB(image)->view(ctx);
SkASSERT(view);
- SkASSERT(mipMapped == GrMipMapped::kNo ||
- view->asTextureProxy()->mipMapped() == GrMipMapped::kYes);
+ SkASSERT(mipMapped == GrMipmapped::kNo ||
+ view->asTextureProxy()->mipMapped() == GrMipmapped::kYes);
return *view;
}
#endif
diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp
index 6bebc8c..ff2d0cb 100644
--- a/src/core/SkSpecialImage.cpp
+++ b/src/core/SkSpecialImage.cpp
@@ -158,7 +158,7 @@
#if SK_SUPPORT_GPU
if (context) {
- GrSurfaceProxyView view = as_IB(image)->refView(context, GrMipMapped::kNo);
+ GrSurfaceProxyView view = as_IB(image)->refView(context, GrMipmapped::kNo);
return MakeDeferredFromGpu(context, subset, image->uniqueID(), view,
SkColorTypeToGrColorType(image->colorType()),
image->refColorSpace(), props);
@@ -408,7 +408,7 @@
fColorSpace);
}
- auto subsetView = GrSurfaceProxyView::Copy(fContext, fView, GrMipMapped::kNo, *subset,
+ auto subsetView = GrSurfaceProxyView::Copy(fContext, fView, GrMipmapped::kNo, *subset,
SkBackingFit::kExact, SkBudgeted::kYes);
if (!subsetView) {
return nullptr;
diff --git a/src/core/SkSpecialSurface.cpp b/src/core/SkSpecialSurface.cpp
index 606cbed..ee52cd4 100644
--- a/src/core/SkSpecialSurface.cpp
+++ b/src/core/SkSpecialSurface.cpp
@@ -172,7 +172,7 @@
}
auto renderTargetContext = GrRenderTargetContext::Make(
context, colorType, std::move(colorSpace), SkBackingFit::kApprox, {width, height}, 1,
- GrMipMapped::kNo, GrProtected::kNo, kBottomLeft_GrSurfaceOrigin, SkBudgeted::kYes,
+ GrMipmapped::kNo, GrProtected::kNo, kBottomLeft_GrSurfaceOrigin, SkBudgeted::kYes,
props);
if (!renderTargetContext) {
return nullptr;
diff --git a/src/effects/imagefilters/SkArithmeticImageFilter.cpp b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
index 5de3f31..067519f 100644
--- a/src/effects/imagefilters/SkArithmeticImageFilter.cpp
+++ b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
@@ -371,7 +371,7 @@
auto renderTargetContext = GrRenderTargetContext::Make(
context, ctx.grColorType(), ctx.refColorSpace(), SkBackingFit::kApprox, bounds.size(),
- 1, GrMipMapped::kNo, isProtected, kBottomLeft_GrSurfaceOrigin);
+ 1, GrMipmapped::kNo, isProtected, kBottomLeft_GrSurfaceOrigin);
if (!renderTargetContext) {
return nullptr;
}
diff --git a/src/effects/imagefilters/SkDisplacementMapEffect.cpp b/src/effects/imagefilters/SkDisplacementMapEffect.cpp
index 2aed14d..bef906e 100644
--- a/src/effects/imagefilters/SkDisplacementMapEffect.cpp
+++ b/src/effects/imagefilters/SkDisplacementMapEffect.cpp
@@ -349,7 +349,7 @@
auto renderTargetContext = GrRenderTargetContext::Make(
context, ctx.grColorType(), ctx.refColorSpace(), SkBackingFit::kApprox,
- bounds.size(), 1, GrMipMapped::kNo, isProtected, kBottomLeft_GrSurfaceOrigin);
+ bounds.size(), 1, GrMipmapped::kNo, isProtected, kBottomLeft_GrSurfaceOrigin);
if (!renderTargetContext) {
return nullptr;
}
diff --git a/src/effects/imagefilters/SkLightingImageFilter.cpp b/src/effects/imagefilters/SkLightingImageFilter.cpp
index 831c72c..31f6848 100644
--- a/src/effects/imagefilters/SkLightingImageFilter.cpp
+++ b/src/effects/imagefilters/SkLightingImageFilter.cpp
@@ -487,7 +487,7 @@
auto renderTargetContext = GrRenderTargetContext::Make(
context, ctx.grColorType(), ctx.refColorSpace(), SkBackingFit::kApprox,
- offsetBounds.size(), 1, GrMipMapped::kNo, inputView.proxy()->isProtected(),
+ offsetBounds.size(), 1, GrMipmapped::kNo, inputView.proxy()->isProtected(),
kBottomLeft_GrSurfaceOrigin);
if (!renderTargetContext) {
return nullptr;
diff --git a/src/effects/imagefilters/SkMorphologyImageFilter.cpp b/src/effects/imagefilters/SkMorphologyImageFilter.cpp
index 79fe77c..143bc83 100644
--- a/src/effects/imagefilters/SkMorphologyImageFilter.cpp
+++ b/src/effects/imagefilters/SkMorphologyImageFilter.cpp
@@ -464,7 +464,7 @@
if (radius.fWidth > 0) {
auto dstRTContext = GrRenderTargetContext::Make(
context, colorType, colorSpace, SkBackingFit::kApprox, rect.size(), 1,
- GrMipMapped::kNo, proxy->isProtected(), kBottomLeft_GrSurfaceOrigin);
+ GrMipmapped::kNo, proxy->isProtected(), kBottomLeft_GrSurfaceOrigin);
if (!dstRTContext) {
return nullptr;
}
@@ -484,7 +484,7 @@
if (radius.fHeight > 0) {
auto dstRTContext = GrRenderTargetContext::Make(
context, colorType, colorSpace, SkBackingFit::kApprox, rect.size(), 1,
- GrMipMapped::kNo, srcView.proxy()->isProtected(), kBottomLeft_GrSurfaceOrigin);
+ GrMipmapped::kNo, srcView.proxy()->isProtected(), kBottomLeft_GrSurfaceOrigin);
if (!dstRTContext) {
return nullptr;
}
diff --git a/src/gpu/GrAHardwareBufferImageGenerator.cpp b/src/gpu/GrAHardwareBufferImageGenerator.cpp
index 129e271..7aa3074 100644
--- a/src/gpu/GrAHardwareBufferImageGenerator.cpp
+++ b/src/gpu/GrAHardwareBufferImageGenerator.cpp
@@ -178,7 +178,7 @@
return tex;
},
- backendFormat, {width, height}, GrRenderable::kNo, 1, GrMipMapped::kNo,
+ backendFormat, {width, height}, GrRenderable::kNo, 1, GrMipmapped::kNo,
GrMipMapsStatus::kNotAllocated, GrInternalSurfaceFlags::kReadOnly, SkBackingFit::kExact,
SkBudgeted::kNo, GrProtected(fIsProtectedContent), GrSurfaceProxy::UseAllocator::kYes);
@@ -191,7 +191,7 @@
GrRecordingContext* context,
const SkImageInfo& info,
const SkIPoint& origin,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrImageTexGenPolicy texGenPolicy) {
GrSurfaceProxyView texProxyView = this->makeView(context);
if (!texProxyView.proxy()) {
@@ -200,7 +200,7 @@
SkASSERT(texProxyView.asTextureProxy());
if (texGenPolicy == GrImageTexGenPolicy::kDraw && origin.isZero() &&
- info.dimensions() == this->getInfo().dimensions() && mipMapped == GrMipMapped::kNo) {
+ info.dimensions() == this->getInfo().dimensions() && mipMapped == GrMipmapped::kNo) {
// If the caller wants the full non-MIP mapped texture we're done.
return texProxyView;
}
diff --git a/src/gpu/GrAHardwareBufferImageGenerator.h b/src/gpu/GrAHardwareBufferImageGenerator.h
index 748c0e2..1e5a75f 100644
--- a/src/gpu/GrAHardwareBufferImageGenerator.h
+++ b/src/gpu/GrAHardwareBufferImageGenerator.h
@@ -43,7 +43,7 @@
bool onIsValid(GrRecordingContext*) const override;
GrSurfaceProxyView onGenerateTexture(GrRecordingContext*, const SkImageInfo&, const SkIPoint&,
- GrMipMapped, GrImageTexGenPolicy) override;
+ GrMipmapped, GrImageTexGenPolicy) override;
private:
GrAHardwareBufferImageGenerator(const SkImageInfo&, AHardwareBuffer*, SkAlphaType,
diff --git a/src/gpu/GrAHardwareBufferUtils.cpp b/src/gpu/GrAHardwareBufferUtils.cpp
index f2137f3..a79af0a 100644
--- a/src/gpu/GrAHardwareBufferUtils.cpp
+++ b/src/gpu/GrAHardwareBufferUtils.cpp
@@ -277,7 +277,7 @@
*updateProc = update_gl_texture;
*imageCtx = new GLTextureHelper(texID, image, display, target);
- return GrBackendTexture(width, height, GrMipMapped::kNo, textureInfo);
+ return GrBackendTexture(width, height, GrMipmapped::kNo, textureInfo);
}
#ifdef SK_VULKAN
diff --git a/src/gpu/GrBackendSurface.cpp b/src/gpu/GrBackendSurface.cpp
index a1e0203..40f3a95 100644
--- a/src/gpu/GrBackendSurface.cpp
+++ b/src/gpu/GrBackendSurface.cpp
@@ -396,7 +396,7 @@
: fIsValid(true)
, fWidth(width)
, fHeight(height)
- , fMipMapped(GrMipMapped(dawnInfo.fLevelCount > 1))
+ , fMipMapped(GrMipmapped(dawnInfo.fLevelCount > 1))
, fBackend(GrBackendApi::kDawn)
, fDawnInfo(dawnInfo) {}
#endif
@@ -415,7 +415,7 @@
: fIsValid(true)
, fWidth(width)
, fHeight(height)
- , fMipMapped(GrMipMapped(vkInfo.fLevelCount > 1))
+ , fMipMapped(GrMipmapped(vkInfo.fLevelCount > 1))
, fBackend(GrBackendApi::kVulkan)
, fVkInfo(vkInfo)
, fMutableState(std::move(mutableState)) {}
@@ -424,7 +424,7 @@
#ifdef SK_GL
GrBackendTexture::GrBackendTexture(int width,
int height,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
const GrGLTextureInfo glInfo,
sk_sp<GrGLTextureParameters> params)
: fIsValid(true)
@@ -445,7 +445,7 @@
#ifdef SK_METAL
GrBackendTexture::GrBackendTexture(int width,
int height,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
const GrMtlTextureInfo& mtlInfo)
: fIsValid(true)
, fWidth(width)
@@ -469,7 +469,7 @@
: fIsValid(true)
, fWidth(width)
, fHeight(height)
- , fMipMapped(GrMipMapped(d3dInfo.fLevelCount > 1))
+ , fMipMapped(GrMipmapped(d3dInfo.fLevelCount > 1))
, fBackend(GrBackendApi::kDirect3D)
, fD3DInfo(d3dInfo, state.release()) {}
#endif
@@ -477,7 +477,7 @@
#ifdef SK_GL
GrBackendTexture::GrBackendTexture(int width,
int height,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
const GrGLTextureInfo& glInfo)
: GrBackendTexture(width, height, mipMapped, glInfo, sk_make_sp<GrGLTextureParameters>()) {
// Make no assumptions about client's texture's parameters.
@@ -487,7 +487,7 @@
GrBackendTexture::GrBackendTexture(int width,
int height,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
const GrMockTextureInfo& mockInfo)
: fIsValid(true)
, fWidth(width)
diff --git a/src/gpu/GrBackendTextureImageGenerator.cpp b/src/gpu/GrBackendTextureImageGenerator.cpp
index b9bb3d4..b1a7dd3 100644
--- a/src/gpu/GrBackendTextureImageGenerator.cpp
+++ b/src/gpu/GrBackendTextureImageGenerator.cpp
@@ -97,7 +97,7 @@
GrRecordingContext* context,
const SkImageInfo& info,
const SkIPoint& origin,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrImageTexGenPolicy texGenPolicy) {
SkASSERT(context);
@@ -147,8 +147,8 @@
GrColorType grColorType = SkColorTypeToGrColorType(info.colorType());
- GrMipMapped textureIsMipMapped = fBackendTexture.hasMipMaps() ? GrMipMapped::kYes
- : GrMipMapped::kNo;
+ GrMipmapped textureIsMipMapped = fBackendTexture.hasMipMaps() ? GrMipmapped::kYes
+ : GrMipmapped::kNo;
// Ganesh assumes that, when wrapping a mipmapped backend texture from a client, that its
// mipmaps are fully fleshed out.
@@ -210,7 +210,7 @@
if (texGenPolicy == GrImageTexGenPolicy::kDraw && origin.isZero() &&
info.dimensions() == fBackendTexture.dimensions() &&
- (mipMapped == GrMipMapped::kNo || proxy->mipMapped() == GrMipMapped::kYes)) {
+ (mipMapped == GrMipmapped::kNo || proxy->mipMapped() == GrMipmapped::kYes)) {
// If the caller wants the entire texture and we have the correct mip support, we're done
return GrSurfaceProxyView(std::move(proxy), fSurfaceOrigin, readSwizzle);
} else {
diff --git a/src/gpu/GrBackendTextureImageGenerator.h b/src/gpu/GrBackendTextureImageGenerator.h
index 7306766..0fe4ef6 100644
--- a/src/gpu/GrBackendTextureImageGenerator.h
+++ b/src/gpu/GrBackendTextureImageGenerator.h
@@ -44,7 +44,7 @@
}
GrSurfaceProxyView onGenerateTexture(GrRecordingContext*, const SkImageInfo&, const SkIPoint&,
- GrMipMapped mipMapped, GrImageTexGenPolicy) override;
+ GrMipmapped mipMapped, GrImageTexGenPolicy) override;
private:
GrBackendTextureImageGenerator(const SkImageInfo& info, GrTexture*, GrSurfaceOrigin,
diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp
index 62b1308..e587b0a 100644
--- a/src/gpu/GrBitmapTextureMaker.cpp
+++ b/src/gpu/GrBitmapTextureMaker.cpp
@@ -54,7 +54,7 @@
}
}
-GrSurfaceProxyView GrBitmapTextureMaker::refOriginalTextureProxyView(GrMipMapped mipMapped) {
+GrSurfaceProxyView GrBitmapTextureMaker::refOriginalTextureProxyView(GrMipmapped mipMapped) {
GrProxyProvider* proxyProvider = this->context()->priv().proxyProvider();
sk_sp<GrTextureProxy> proxy;
GrSwizzle swizzle;
@@ -70,7 +70,7 @@
if (proxy) {
swizzle = this->context()->priv().caps()->getReadSwizzle(proxy->backendFormat(),
this->colorType());
- if (mipMapped == GrMipMapped::kNo || proxy->mipMapped() == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kNo || proxy->mipMapped() == GrMipmapped::kYes) {
return {std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle};
}
}
@@ -92,7 +92,7 @@
if (proxy) {
swizzle = this->context()->priv().caps()->getReadSwizzle(proxy->backendFormat(),
this->colorType());
- SkASSERT(mipMapped == GrMipMapped::kNo || proxy->mipMapped() == GrMipMapped::kYes);
+ SkASSERT(mipMapped == GrMipmapped::kNo || proxy->mipMapped() == GrMipmapped::kYes);
if (fKey.isValid()) {
installKey(proxy.get());
}
@@ -101,8 +101,8 @@
}
if (proxy) {
- SkASSERT(mipMapped == GrMipMapped::kYes);
- SkASSERT(proxy->mipMapped() == GrMipMapped::kNo);
+ SkASSERT(mipMapped == GrMipmapped::kYes);
+ SkASSERT(proxy->mipMapped() == GrMipmapped::kNo);
SkASSERT(fKey.isValid());
// We need a mipped proxy, but we found a proxy earlier that wasn't mipped. Thus we generate
// a new mipped surface and copy the original proxy into the base layer. We will then let
diff --git a/src/gpu/GrBitmapTextureMaker.h b/src/gpu/GrBitmapTextureMaker.h
index fc92966..2723087 100644
--- a/src/gpu/GrBitmapTextureMaker.h
+++ b/src/gpu/GrBitmapTextureMaker.h
@@ -26,7 +26,7 @@
private:
GrBitmapTextureMaker(GrRecordingContext*, const SkBitmap&, GrImageTexGenPolicy, SkBackingFit);
- GrSurfaceProxyView refOriginalTextureProxyView(GrMipMapped) override;
+ GrSurfaceProxyView refOriginalTextureProxyView(GrMipmapped) override;
const SkBitmap fBitmap;
const SkBackingFit fFit;
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index 778dbd5..03ad192 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -153,7 +153,7 @@
bm.setImmutable();
GrBitmapTextureMaker maker(context, bm, SkBackingFit::kApprox);
- filteredMaskView = maker.view(GrMipMapped::kNo);
+ filteredMaskView = maker.view(GrMipmapped::kNo);
if (!filteredMaskView.proxy()) {
return false;
}
@@ -189,7 +189,7 @@
auto approxSize = GrResourceProvider::MakeApprox(maskRect.size());
auto rtContext = GrRenderTargetContext::MakeWithFallback(
context, GrColorType::kAlpha_8, nullptr, SkBackingFit::kExact, approxSize, sampleCnt,
- GrMipMapped::kNo, GrProtected::kNo, kMaskOrigin);
+ GrMipmapped::kNo, GrProtected::kNo, kMaskOrigin);
if (!rtContext) {
return nullptr;
}
diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp
index 2318519..29216d0 100644
--- a/src/gpu/GrCaps.cpp
+++ b/src/gpu/GrCaps.cpp
@@ -308,12 +308,12 @@
bool GrCaps::validateSurfaceParams(const SkISize& dimensions, const GrBackendFormat& format,
GrRenderable renderable, int renderTargetSampleCnt,
- GrMipMapped mipped) const {
+ GrMipmapped mipped) const {
if (!this->isFormatTexturable(format)) {
return false;
}
- if (GrMipMapped::kYes == mipped && !this->mipMapSupport()) {
+ if (GrMipmapped::kYes == mipped && !this->mipMapSupport()) {
return false;
}
diff --git a/src/gpu/GrCaps.h b/src/gpu/GrCaps.h
index 1696776..2564053 100644
--- a/src/gpu/GrCaps.h
+++ b/src/gpu/GrCaps.h
@@ -400,7 +400,7 @@
}
bool validateSurfaceParams(const SkISize&, const GrBackendFormat&, GrRenderable renderable,
- int renderTargetSampleCnt, GrMipMapped) const;
+ int renderTargetSampleCnt, GrMipmapped) const;
bool areColorTypeAndFormatCompatible(GrColorType grCT, const GrBackendFormat& format) const;
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index 5ae70cf..08d0a46 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -359,7 +359,7 @@
auto rtc = GrRenderTargetContext::MakeWithFallback(
context, GrColorType::kAlpha_8, nullptr, SkBackingFit::kApprox,
- {reducedClip.width(), reducedClip.height()}, 1, GrMipMapped::kNo, GrProtected::kNo,
+ {reducedClip.width(), reducedClip.height()}, 1, GrMipmapped::kNo, GrProtected::kNo,
kMaskOrigin);
if (!rtc) {
return {};
@@ -492,7 +492,7 @@
maskSpaceIBounds.size(),
GrRenderable::kNo,
1,
- GrMipMapped::kNo,
+ GrMipmapped::kNo,
SkBackingFit::kApprox,
SkBudgeted::kYes,
GrProtected::kNo);
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 1a9e7bd..cbca23c 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -252,7 +252,7 @@
return fResourceCache->getPurgeableBytes();
}
-size_t GrContext::ComputeImageSize(sk_sp<SkImage> image, GrMipMapped mipMapped, bool useNextPow2) {
+size_t GrContext::ComputeImageSize(sk_sp<SkImage> image, GrMipmapped mipMapped, bool useNextPow2) {
if (!image->isTextureBacked()) {
return 0;
}
@@ -398,7 +398,7 @@
//////////////////////////////////////////////////////////////////////////////
GrBackendTexture GrContext::createBackendTexture(int width, int height,
const GrBackendFormat& backendFormat,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrRenderable renderable,
GrProtected isProtected) {
TRACE_EVENT0("skia.gpu", TRACE_FUNC);
@@ -416,7 +416,7 @@
GrBackendTexture GrContext::createBackendTexture(int width, int height,
SkColorType skColorType,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrRenderable renderable,
GrProtected isProtected) {
if (!this->asDirectContext()) {
@@ -456,7 +456,7 @@
}
GrBackendTexture result = this->createBackendTexture(c.width(), c.height(), format,
- GrMipMapped(c.isMipMapped()),
+ GrMipmapped(c.isMipMapped()),
GrRenderable::kYes,
c.isProtected());
SkASSERT(c.isCompatible(result));
@@ -467,7 +467,7 @@
GrDirectContext* context,
SkISize dimensions,
const GrBackendFormat& backendFormat,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrRenderable renderable,
GrProtected isProtected,
sk_sp<GrRefCntedCallback> finishedCallback,
@@ -521,7 +521,7 @@
GrGpu::BackendTextureData data(color);
GrBackendTexture result = create_and_update_backend_texture(
- this->asDirectContext(), {c.width(), c.height()}, format, GrMipMapped(c.isMipMapped()),
+ this->asDirectContext(), {c.width(), c.height()}, format, GrMipmapped(c.isMipMapped()),
GrRenderable::kYes, c.isProtected(), std::move(finishedCallback), &data);
SkASSERT(c.isCompatible(result));
@@ -531,7 +531,7 @@
GrBackendTexture GrContext::createBackendTexture(int width, int height,
const GrBackendFormat& backendFormat,
const SkColor4f& color,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrRenderable renderable,
GrProtected isProtected,
GrGpuFinishedProc finishedProc,
@@ -559,7 +559,7 @@
GrBackendTexture GrContext::createBackendTexture(int width, int height,
SkColorType skColorType,
const SkColor4f& color,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrRenderable renderable,
GrProtected isProtected,
GrGpuFinishedProc finishedProc,
@@ -618,11 +618,11 @@
int baseHeight = srcData[0].height();
SkColorType colorType = srcData[0].colorType();
- GrMipMapped mipMapped = GrMipMapped::kNo;
+ GrMipmapped mipMapped = GrMipmapped::kNo;
int numExpectedLevels = 1;
if (numProvidedLevels > 1) {
numExpectedLevels = SkMipmap::ComputeLevelCount(baseWidth, baseHeight) + 1;
- mipMapped = GrMipMapped::kYes;
+ mipMapped = GrMipmapped::kYes;
}
if (numProvidedLevels != numExpectedLevels) {
@@ -699,7 +699,7 @@
GrDirectContext* context,
SkISize dimensions,
const GrBackendFormat& backendFormat,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
sk_sp<GrRefCntedCallback> finishedCallback,
const GrGpu::BackendTextureData* data) {
@@ -722,7 +722,7 @@
GrBackendTexture GrContext::createCompressedBackendTexture(int width, int height,
const GrBackendFormat& backendFormat,
const SkColor4f& color,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
GrGpuFinishedProc finishedProc,
GrGpuFinishedContext finishedContext) {
@@ -749,7 +749,7 @@
GrBackendTexture GrContext::createCompressedBackendTexture(int width, int height,
SkImage::CompressionType compression,
const SkColor4f& color,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
GrGpuFinishedProc finishedProc,
GrGpuFinishedContext finishedContext) {
@@ -764,7 +764,7 @@
const GrBackendFormat& backendFormat,
const void* compressedData,
size_t dataSize,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
GrGpuFinishedProc finishedProc,
GrGpuFinishedContext finishedContext) {
@@ -791,7 +791,7 @@
GrBackendTexture GrContext::createCompressedBackendTexture(int width, int height,
SkImage::CompressionType compression,
const void* data, size_t dataSize,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
GrGpuFinishedProc finishedProc,
GrGpuFinishedContext finishedContext) {
diff --git a/src/gpu/GrCopyRenderTask.h b/src/gpu/GrCopyRenderTask.h
index 4ecd3c7..a17cf09 100644
--- a/src/gpu/GrCopyRenderTask.h
+++ b/src/gpu/GrCopyRenderTask.h
@@ -42,7 +42,7 @@
#ifdef SK_DEBUG
const char* name() const final { return "Copy"; }
void visitProxies_debugOnly(const GrOp::VisitProxyFunc& fn) const override {
- fn(fSrcView.proxy(), GrMipMapped::kNo);
+ fn(fSrcView.proxy(), GrMipmapped::kNo);
}
#endif
diff --git a/src/gpu/GrDataUtils.cpp b/src/gpu/GrDataUtils.cpp
index e7377f0..23e5d27 100644
--- a/src/gpu/GrDataUtils.cpp
+++ b/src/gpu/GrDataUtils.cpp
@@ -296,11 +296,11 @@
}
void GrFillInCompressedData(SkImage::CompressionType type, SkISize dimensions,
- GrMipMapped mipMapped, char* dstPixels, const SkColor4f& colorf) {
+ GrMipmapped mipMapped, char* dstPixels, const SkColor4f& colorf) {
TRACE_EVENT0("skia.gpu", TRACE_FUNC);
int numMipLevels = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
numMipLevels = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height()) + 1;
}
diff --git a/src/gpu/GrDataUtils.h b/src/gpu/GrDataUtils.h
index 98915b6..9cb062d 100644
--- a/src/gpu/GrDataUtils.h
+++ b/src/gpu/GrDataUtils.h
@@ -29,7 +29,7 @@
size_t GrComputeTightCombinedBufferSize(size_t bytesPerPixel, SkISize baseDimensions,
SkTArray<size_t>* individualMipOffsets, int mipLevelCount);
-void GrFillInCompressedData(SkImage::CompressionType, SkISize dimensions, GrMipMapped, char* dest,
+void GrFillInCompressedData(SkImage::CompressionType, SkISize dimensions, GrMipmapped, char* dest,
const SkColor4f& color);
// Swizzle param is applied after loading and before converting from srcInfo to dstInfo.
diff --git a/src/gpu/GrDrawOpAtlas.cpp b/src/gpu/GrDrawOpAtlas.cpp
index 610255b..ffea3e1 100644
--- a/src/gpu/GrDrawOpAtlas.cpp
+++ b/src/gpu/GrDrawOpAtlas.cpp
@@ -599,7 +599,7 @@
for (uint32_t i = 0; i < this->maxPages(); ++i) {
GrSwizzle swizzle = proxyProvider->caps()->getReadSwizzle(fFormat, fColorType);
sk_sp<GrSurfaceProxy> proxy = proxyProvider->createProxy(
- fFormat, dims, GrRenderable::kNo, 1, GrMipMapped::kNo, SkBackingFit::kExact,
+ fFormat, dims, GrRenderable::kNo, 1, GrMipmapped::kNo, SkBackingFit::kExact,
SkBudgeted::kYes, GrProtected::kNo, GrInternalSurfaceFlags::kNone,
GrSurfaceProxy::UseAllocator::kNo);
if (!proxy) {
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 9748824..7a87803 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -269,14 +269,14 @@
// OnFlush callbacks are invoked during flush, and are therefore expected to handle
// resource allocation & usage on their own. (No deferred or lazy proxies!)
onFlushRenderTask->visitTargetAndSrcProxies_debugOnly(
- [](GrSurfaceProxy* p, GrMipMapped mipMapped) {
+ [](GrSurfaceProxy* p, GrMipmapped mipMapped) {
SkASSERT(!p->asTextureProxy() || !p->asTextureProxy()->texPriv().isDeferred());
SkASSERT(!p->isLazy());
if (p->requiresManualMSAAResolve()) {
// The onFlush callback is responsible for ensuring MSAA gets resolved.
SkASSERT(p->asRenderTargetProxy() && !p->asRenderTargetProxy()->isMSAADirty());
}
- if (GrMipMapped::kYes == mipMapped) {
+ if (GrMipmapped::kYes == mipMapped) {
// The onFlush callback is responsible for regenerating mips if needed.
SkASSERT(p->asTextureProxy() && !p->asTextureProxy()->mipMapsAreDirty());
}
@@ -656,7 +656,7 @@
ddl->characterization().origin());
}
GrTextureProxy* newTextureProxy = newDest->asTextureProxy();
- if (newTextureProxy && GrMipMapped::kYes == newTextureProxy->mipMapped()) {
+ if (newTextureProxy && GrMipmapped::kYes == newTextureProxy->mipMapped()) {
newTextureProxy->markMipMapsDirty();
}
@@ -861,9 +861,9 @@
const GrCaps& caps = *fContext->priv().caps();
- // We always say GrMipMapped::kNo here since we are always just copying from the base layer. We
+ // We always say GrMipmapped::kNo here since we are always just copying from the base layer. We
// don't need to make sure the whole mip map chain is valid.
- task->addDependency(this, srcProxy.get(), GrMipMapped::kNo,
+ task->addDependency(this, srcProxy.get(), GrMipmapped::kNo,
GrTextureResolveManager(this), caps);
task->makeClosed(caps);
@@ -892,9 +892,9 @@
return false;
}
- // We always say GrMipMapped::kNo here since we are always just copying from the base layer to
+ // We always say GrMipmapped::kNo here since we are always just copying from the base layer to
// another base layer. We don't need to make sure the whole mip map chain is valid.
- task->addDependency(this, srcProxy, GrMipMapped::kNo, GrTextureResolveManager(this), caps);
+ task->addDependency(this, srcProxy, GrMipmapped::kNo, GrTextureResolveManager(this), caps);
task->makeClosed(caps);
// We have closed the previous active oplist but since a new oplist isn't being added there
diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp
index 5a8b0df..6c2ec99 100644
--- a/src/gpu/GrFragmentProcessor.cpp
+++ b/src/gpu/GrFragmentProcessor.cpp
@@ -46,7 +46,7 @@
void GrFragmentProcessor::visitProxies(const GrOp::VisitProxyFunc& func) const {
this->visitTextureEffects([&func](const GrTextureEffect& te) {
bool mipped = (GrSamplerState::Filter::kMipMap == te.samplerState().filter());
- func(te.view().proxy(), GrMipMapped(mipped));
+ func(te.view().proxy(), GrMipmapped(mipped));
});
}
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index c862d27..0c5fefc 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -106,7 +106,7 @@
return nullptr;
}
- GrMipMapped mipMapped = mipLevelCount > 1 ? GrMipMapped::kYes : GrMipMapped::kNo;
+ GrMipmapped mipMapped = mipLevelCount > 1 ? GrMipmapped::kYes : GrMipmapped::kNo;
if (!this->caps()->validateSurfaceParams(dimensions, format, renderable, renderTargetSampleCnt,
mipMapped)) {
return nullptr;
@@ -146,11 +146,11 @@
const GrBackendFormat& format,
GrRenderable renderable,
int renderTargetSampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkBudgeted budgeted,
GrProtected isProtected) {
int mipLevelCount = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
mipLevelCount =
32 - SkCLZ(static_cast<uint32_t>(std::max(dimensions.fWidth, dimensions.fHeight)));
}
@@ -158,7 +158,7 @@
this->caps()->shouldInitializeTextures() ? (1 << mipLevelCount) - 1 : 0;
auto tex = this->createTextureCommon(dimensions, format, renderable, renderTargetSampleCnt,
budgeted, isProtected, mipLevelCount, levelClearMask);
- if (tex && mipMapped == GrMipMapped::kYes && levelClearMask) {
+ if (tex && mipMapped == GrMipmapped::kYes && levelClearMask) {
tex->texturePriv().markMipMapsClean();
}
return tex;
@@ -224,7 +224,7 @@
sk_sp<GrTexture> GrGpu::createCompressedTexture(SkISize dimensions,
const GrBackendFormat& format,
SkBudgeted budgeted,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
const void* data,
size_t dataSize) {
@@ -246,7 +246,7 @@
SkImage::CompressionType compressionType = GrBackendFormatToCompressionType(format);
if (dataSize < SkCompressedDataSize(compressionType, dimensions, nullptr,
- mipMapped == GrMipMapped::kYes)) {
+ mipMapped == GrMipmapped::kYes)) {
return nullptr;
}
return this->onCreateCompressedTexture(dimensions, format, budgeted, mipMapped, isProtected,
@@ -552,7 +552,7 @@
TRACE_EVENT0("skia.gpu", TRACE_FUNC);
SkASSERT(texture);
SkASSERT(this->caps()->mipMapSupport());
- SkASSERT(texture->texturePriv().mipMapped() == GrMipMapped::kYes);
+ SkASSERT(texture->texturePriv().mipMapped() == GrMipmapped::kYes);
if (!texture->texturePriv().mipMapsAreDirty()) {
// This can happen when the proxy expects mipmaps to be dirty, but they are not dirty on the
// actual target. This may be caused by things that the drawingManager could not predict,
@@ -769,10 +769,10 @@
#endif // GR_TEST_UTILS
bool GrGpu::MipMapsAreCorrect(SkISize dimensions,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
const BackendTextureData* data) {
int numMipLevels = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
numMipLevels = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height()) + 1;
}
@@ -804,7 +804,7 @@
}
bool GrGpu::CompressedDataIsCorrect(SkISize dimensions, SkImage::CompressionType compressionType,
- GrMipMapped mipMapped, const BackendTextureData* data) {
+ GrMipmapped mipMapped, const BackendTextureData* data) {
if (!data || data->type() == BackendTextureData::Type::kColor) {
return true;
@@ -817,7 +817,7 @@
SkASSERT(data->type() == BackendTextureData::Type::kCompressed);
size_t computedSize = SkCompressedDataSize(compressionType, dimensions,
- nullptr, mipMapped == GrMipMapped::kYes);
+ nullptr, mipMapped == GrMipmapped::kYes);
return computedSize == data->compressedSize();
}
@@ -825,7 +825,7 @@
GrBackendTexture GrGpu::createBackendTexture(SkISize dimensions,
const GrBackendFormat& format,
GrRenderable renderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected) {
const GrCaps* caps = this->caps();
@@ -843,7 +843,7 @@
return {};
}
- if (mipMapped == GrMipMapped::kYes && !this->caps()->mipMapSupport()) {
+ if (mipMapped == GrMipmapped::kYes && !this->caps()->mipMapSupport()) {
return {};
}
@@ -871,7 +871,7 @@
return false;
}
- GrMipMapped mipMapped = backendTexture.hasMipMaps() ? GrMipMapped::kYes : GrMipMapped::kNo;
+ GrMipmapped mipMapped = backendTexture.hasMipMaps() ? GrMipmapped::kYes : GrMipmapped::kNo;
if (!MipMapsAreCorrect(backendTexture.dimensions(), mipMapped, data)) {
return false;
}
@@ -881,7 +881,7 @@
GrBackendTexture GrGpu::createCompressedBackendTexture(SkISize dimensions,
const GrBackendFormat& format,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected) {
const GrCaps* caps = this->caps();
@@ -901,7 +901,7 @@
return {};
}
- if (mipMapped == GrMipMapped::kYes && !this->caps()->mipMapSupport()) {
+ if (mipMapped == GrMipmapped::kYes && !this->caps()->mipMapSupport()) {
return {};
}
@@ -929,7 +929,7 @@
return false;
}
- GrMipMapped mipMapped = backendTexture.hasMipMaps() ? GrMipMapped::kYes : GrMipMapped::kNo;
+ GrMipmapped mipMapped = backendTexture.hasMipMaps() ? GrMipmapped::kYes : GrMipmapped::kNo;
if (!CompressedDataIsCorrect(backendTexture.dimensions(), compressionType, mipMapped, data)) {
return false;
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h
index d16439a..23704aa 100644
--- a/src/gpu/GrGpu.h
+++ b/src/gpu/GrGpu.h
@@ -135,14 +135,14 @@
const GrBackendFormat& format,
GrRenderable renderable,
int renderTargetSampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkBudgeted budgeted,
GrProtected isProtected);
sk_sp<GrTexture> createCompressedTexture(SkISize dimensions,
const GrBackendFormat& format,
SkBudgeted budgeted,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
const void* data, size_t dataSize);
@@ -607,7 +607,7 @@
GrBackendTexture createBackendTexture(SkISize dimensions,
const GrBackendFormat&,
GrRenderable,
- GrMipMapped,
+ GrMipmapped,
GrProtected);
bool updateBackendTexture(const GrBackendTexture&,
@@ -620,7 +620,7 @@
*/
GrBackendTexture createCompressedBackendTexture(SkISize dimensions,
const GrBackendFormat&,
- GrMipMapped,
+ GrMipmapped,
GrProtected);
bool updateCompressedBackendTexture(const GrBackendTexture&,
@@ -705,9 +705,9 @@
virtual void xferBarrier(GrRenderTarget*, GrXferBarrierType) = 0;
protected:
- static bool MipMapsAreCorrect(SkISize dimensions, GrMipMapped, const BackendTextureData*);
+ static bool MipMapsAreCorrect(SkISize dimensions, GrMipmapped, const BackendTextureData*);
static bool CompressedDataIsCorrect(SkISize dimensions, SkImage::CompressionType,
- GrMipMapped, const BackendTextureData*);
+ GrMipmapped, const BackendTextureData*);
// Handles cases where a surface will be updated without a call to flushRenderTarget.
void didWriteToSurface(GrSurface* surface, GrSurfaceOrigin origin, const SkIRect* bounds,
@@ -724,11 +724,11 @@
virtual GrBackendTexture onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat&,
GrRenderable,
- GrMipMapped,
+ GrMipmapped,
GrProtected) = 0;
virtual GrBackendTexture onCreateCompressedBackendTexture(
- SkISize dimensions, const GrBackendFormat&, GrMipMapped, GrProtected) = 0;
+ SkISize dimensions, const GrBackendFormat&, GrMipmapped, GrProtected) = 0;
virtual bool onUpdateBackendTexture(const GrBackendTexture&,
sk_sp<GrRefCntedCallback> finishedCallback,
@@ -764,7 +764,7 @@
virtual sk_sp<GrTexture> onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat&,
SkBudgeted,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
const void* data, size_t dataSize) = 0;
virtual sk_sp<GrTexture> onWrapBackendTexture(const GrBackendTexture&,
diff --git a/src/gpu/GrImageTextureMaker.cpp b/src/gpu/GrImageTextureMaker.cpp
index 67514cc..845bea2 100644
--- a/src/gpu/GrImageTextureMaker.cpp
+++ b/src/gpu/GrImageTextureMaker.cpp
@@ -34,7 +34,7 @@
SkASSERT(client->isLazyGenerated());
}
-GrSurfaceProxyView GrImageTextureMaker::refOriginalTextureProxyView(GrMipMapped mipMapped) {
+GrSurfaceProxyView GrImageTextureMaker::refOriginalTextureProxyView(GrMipmapped mipMapped) {
return fImage->lockTextureProxyView(this->context(), fTexGenPolicy, mipMapped);
}
@@ -46,8 +46,8 @@
SkASSERT(as_IB(client)->isYUVA());
}
-GrSurfaceProxyView GrYUVAImageTextureMaker::refOriginalTextureProxyView(GrMipMapped mipMapped) {
- if (mipMapped == GrMipMapped::kYes) {
+GrSurfaceProxyView GrYUVAImageTextureMaker::refOriginalTextureProxyView(GrMipmapped mipMapped) {
+ if (mipMapped == GrMipmapped::kYes) {
return fImage->refMippedView(this->context());
} else {
if (const GrSurfaceProxyView* view = fImage->view(this->context())) {
diff --git a/src/gpu/GrImageTextureMaker.h b/src/gpu/GrImageTextureMaker.h
index 2d565ed..332be2e 100644
--- a/src/gpu/GrImageTextureMaker.h
+++ b/src/gpu/GrImageTextureMaker.h
@@ -22,7 +22,7 @@
GrImageTextureMaker(GrRecordingContext*, const SkImage* client, GrImageTexGenPolicy);
private:
- GrSurfaceProxyView refOriginalTextureProxyView(GrMipMapped) override;
+ GrSurfaceProxyView refOriginalTextureProxyView(GrMipmapped) override;
const SkImage_Lazy* fImage;
GrImageTexGenPolicy fTexGenPolicy;
@@ -50,7 +50,7 @@
bool isPlanar() const override { return true; }
private:
- GrSurfaceProxyView refOriginalTextureProxyView(GrMipMapped) override;
+ GrSurfaceProxyView refOriginalTextureProxyView(GrMipmapped) override;
const SkImage_GpuYUVA* fImage;
diff --git a/src/gpu/GrOpsRenderPass.cpp b/src/gpu/GrOpsRenderPass.cpp
index b891d1b..bb441fc 100644
--- a/src/gpu/GrOpsRenderPass.cpp
+++ b/src/gpu/GrOpsRenderPass.cpp
@@ -116,7 +116,7 @@
DynamicStateStatus::kUninitialized : DynamicStateStatus::kDisabled;
bool hasTextures = (programInfo.primProc().numTextureSamplers() > 0);
if (!hasTextures) {
- programInfo.pipeline().visitProxies([&hasTextures](GrSurfaceProxy*, GrMipMapped) {
+ programInfo.pipeline().visitProxies([&hasTextures](GrSurfaceProxy*, GrMipmapped) {
hasTextures = true;
});
}
@@ -162,7 +162,7 @@
(tex->width() != 1 || tex->height() != 1)) {
// There are some cases where we might be given a non-mipmapped texture with a mipmap
// filter. See skbug.com/7094.
- SkASSERT(tex->texturePriv().mipMapped() != GrMipMapped::kYes ||
+ SkASSERT(tex->texturePriv().mipMapped() != GrMipmapped::kYes ||
!tex->texturePriv().mipMapsAreDirty());
}
}
diff --git a/src/gpu/GrOpsTask.cpp b/src/gpu/GrOpsTask.cpp
index 84f4acc..614e982 100644
--- a/src/gpu/GrOpsTask.cpp
+++ b/src/gpu/GrOpsTask.cpp
@@ -146,7 +146,7 @@
op.visitProxies(func);
}
if (fDstProxyView.proxy()) {
- func(fDstProxyView.proxy(), GrMipMapped::kNo);
+ func(fDstProxyView.proxy(), GrMipmapped::kNo);
}
if (fAppliedClip) {
fAppliedClip->visitProxies(func);
@@ -700,7 +700,7 @@
}
void GrOpsTask::visitProxies_debugOnly(const GrOp::VisitProxyFunc& func) const {
- auto textureFunc = [ func ] (GrSurfaceProxy* tex, GrMipMapped mipmapped) {
+ auto textureFunc = [ func ] (GrSurfaceProxy* tex, GrMipmapped mipmapped) {
func(tex, mipmapped);
};
@@ -716,7 +716,7 @@
bool GrOpsTask::onIsUsed(GrSurfaceProxy* proxyToCheck) const {
bool used = false;
- auto visit = [ proxyToCheck, &used ] (GrSurfaceProxy* p, GrMipMapped) {
+ auto visit = [ proxyToCheck, &used ] (GrSurfaceProxy* p, GrMipmapped) {
if (p == proxyToCheck) {
used = true;
}
@@ -730,7 +730,7 @@
void GrOpsTask::handleInternalAllocationFailure() {
bool hasUninstantiatedProxy = false;
- auto checkInstantiation = [&hasUninstantiatedProxy](GrSurfaceProxy* p, GrMipMapped) {
+ auto checkInstantiation = [&hasUninstantiatedProxy](GrSurfaceProxy* p, GrMipmapped) {
if (!p->isInstantiated()) {
hasUninstantiatedProxy = true;
}
@@ -772,7 +772,7 @@
alloc->incOps();
}
- auto gather = [ alloc SkDEBUGCODE(, this) ] (GrSurfaceProxy* p, GrMipMapped) {
+ auto gather = [ alloc SkDEBUGCODE(, this) ] (GrSurfaceProxy* p, GrMipmapped) {
alloc->addInterval(p, alloc->curOp(), alloc->curOp(), GrResourceAllocator::ActualUse::kYes
SkDEBUGCODE(, this->target(0).proxy() == p));
};
diff --git a/src/gpu/GrOpsTask.h b/src/gpu/GrOpsTask.h
index ee1906f..edef6f6 100644
--- a/src/gpu/GrOpsTask.h
+++ b/src/gpu/GrOpsTask.h
@@ -91,7 +91,7 @@
void addOp(GrDrawingManager* drawingMgr, std::unique_ptr<GrOp> op,
GrTextureResolveManager textureResolveManager, const GrCaps& caps) {
auto addDependency = [ drawingMgr, textureResolveManager, &caps, this ] (
- GrSurfaceProxy* p, GrMipMapped mipmapped) {
+ GrSurfaceProxy* p, GrMipmapped mipmapped) {
this->addDependency(drawingMgr, p, mipmapped, textureResolveManager, caps);
};
@@ -111,7 +111,7 @@
GrAppliedClip&& clip, const DstProxyView& dstProxyView,
GrTextureResolveManager textureResolveManager, const GrCaps& caps) {
auto addDependency = [ drawingMgr, textureResolveManager, &caps, this ] (
- GrSurfaceProxy* p, GrMipMapped mipmapped) {
+ GrSurfaceProxy* p, GrMipmapped mipmapped) {
this->addSampledTexture(p);
this->addDependency(drawingMgr, p, mipmapped, textureResolveManager, caps);
};
@@ -120,7 +120,7 @@
clip.visitProxies(addDependency);
if (dstProxyView.proxy()) {
this->addSampledTexture(dstProxyView.proxy());
- addDependency(dstProxyView.proxy(), GrMipMapped::kNo);
+ addDependency(dstProxyView.proxy(), GrMipmapped::kNo);
}
this->recordOp(std::move(op), processorAnalysis, clip.doesClip() ? &clip : nullptr,
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index 95cc8a7..351d0a6 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -121,6 +121,6 @@
fp->visitProxies(func);
}
if (fDstProxyView.asTextureProxy()) {
- func(fDstProxyView.asTextureProxy(), GrMipMapped::kNo);
+ func(fDstProxyView.asTextureProxy(), GrMipmapped::kNo);
}
}
diff --git a/src/gpu/GrProgramInfo.cpp b/src/gpu/GrProgramInfo.cpp
index 34e6459..ad58349 100644
--- a/src/gpu/GrProgramInfo.cpp
+++ b/src/gpu/GrProgramInfo.cpp
@@ -31,7 +31,7 @@
}
void GrProgramInfo::checkAllInstantiated() const {
- this->pipeline().visitProxies([](GrSurfaceProxy* proxy, GrMipMapped) {
+ this->pipeline().visitProxies([](GrSurfaceProxy* proxy, GrMipmapped) {
SkASSERT(proxy->isInstantiated());
return true;
});
@@ -47,7 +47,7 @@
(tex->width() != 1 || tex->height() != 1)) {
// There are some cases where we might be given a non-mipmapped texture with a
// mipmap filter. See skbug.com/7094.
- SkASSERT(tex->texturePriv().mipMapped() != GrMipMapped::kYes ||
+ SkASSERT(tex->texturePriv().mipMapped() != GrMipmapped::kYes ||
!tex->texturePriv().mipMapsAreDirty());
}
});
diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index 29a9c28..883cd3c 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -146,7 +146,7 @@
renderTargetSampleCnt, isProtected);
} else {
tex = resourceProvider->createTexture(dimensions, format, renderable, renderTargetSampleCnt,
- GrMipMapped::kNo, budgeted, isProtected);
+ GrMipmapped::kNo, budgeted, isProtected);
}
if (!tex) {
return nullptr;
@@ -254,11 +254,11 @@
}
sk_sp<GrTextureProxy> GrProxyProvider::createProxyFromBitmap(const SkBitmap& bitmap,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkBackingFit fit,
SkBudgeted budgeted) {
ASSERT_SINGLE_OWNER
- SkASSERT(fit == SkBackingFit::kExact || mipMapped == GrMipMapped::kNo);
+ SkASSERT(fit == SkBackingFit::kExact || mipMapped == GrMipmapped::kNo);
if (this->isAbandoned()) {
return nullptr;
@@ -269,7 +269,7 @@
}
ATRACE_ANDROID_FRAMEWORK("Upload %sTexture [%ux%u]",
- GrMipMapped::kYes == mipMapped ? "MipMap " : "",
+ GrMipmapped::kYes == mipMapped ? "MipMap " : "",
bitmap.width(), bitmap.height());
// In non-ddl we will always instantiate right away. Thus we never want to copy the SkBitmap
@@ -285,7 +285,7 @@
}
sk_sp<GrTextureProxy> proxy;
- if (mipMapped == GrMipMapped::kNo ||
+ if (mipMapped == GrMipmapped::kNo ||
0 == SkMipmap::ComputeLevelCount(copyBitmap.width(), copyBitmap.height())) {
proxy = this->createNonMippedProxyFromBitmap(copyBitmap, fit, budgeted);
} else {
@@ -322,14 +322,14 @@
sk_sp<GrTextureProxy> proxy = this->createLazyProxy(
[bitmap](GrResourceProvider* resourceProvider, const LazySurfaceDesc& desc) {
- SkASSERT(desc.fMipMapped == GrMipMapped::kNo);
+ SkASSERT(desc.fMipMapped == GrMipmapped::kNo);
GrMipLevel mipLevel = { bitmap.getPixels(), bitmap.rowBytes() };
auto colorType = SkColorTypeToGrColorType(bitmap.colorType());
return LazyCallbackResult(resourceProvider->createTexture(
desc.fDimensions, desc.fFormat, colorType, desc.fRenderable,
desc.fSampleCnt, desc.fBudgeted, desc.fFit, desc.fProtected, mipLevel));
},
- format, dims, GrRenderable::kNo, 1, GrMipMapped::kNo, GrMipMapsStatus::kNotAllocated,
+ format, dims, GrRenderable::kNo, 1, GrMipmapped::kNo, GrMipMapsStatus::kNotAllocated,
GrInternalSurfaceFlags::kNone, fit, budgeted, GrProtected::kNo, UseAllocator::kYes);
if (!proxy) {
@@ -377,7 +377,7 @@
desc.fDimensions, desc.fFormat, colorType, GrRenderable::kNo, 1,
desc.fBudgeted, GrProtected::kNo, texels.get(), mipLevelCount));
},
- format, dims, GrRenderable::kNo, 1, GrMipMapped::kYes, GrMipMapsStatus::kValid,
+ format, dims, GrRenderable::kNo, 1, GrMipmapped::kYes, GrMipMapsStatus::kValid,
GrInternalSurfaceFlags::kNone, SkBackingFit::kExact, budgeted, GrProtected::kNo,
UseAllocator::kYes);
@@ -394,7 +394,7 @@
SkISize dimensions,
GrRenderable renderable,
int renderTargetSampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkBackingFit fit,
SkBudgeted budgeted,
GrProtected isProtected,
@@ -412,11 +412,11 @@
return nullptr;
}
- if (GrMipMapped::kYes == mipMapped) {
+ if (GrMipmapped::kYes == mipMapped) {
// SkMipmap doesn't include the base level in the level count so we have to add 1
int mipCount = SkMipmap::ComputeLevelCount(dimensions.fWidth, dimensions.fHeight) + 1;
if (1 == mipCount) {
- mipMapped = GrMipMapped::kNo;
+ mipMapped = GrMipmapped::kNo;
}
}
@@ -424,7 +424,7 @@
mipMapped)) {
return nullptr;
}
- GrMipMapsStatus mipMapsStatus = (GrMipMapped::kYes == mipMapped)
+ GrMipMapsStatus mipMapsStatus = (GrMipmapped::kYes == mipMapped)
? GrMipMapsStatus::kDirty
: GrMipMapsStatus::kNotAllocated;
if (renderable == GrRenderable::kYes) {
@@ -443,7 +443,7 @@
}
sk_sp<GrTextureProxy> GrProxyProvider::createCompressedTextureProxy(
- SkISize dimensions, SkBudgeted budgeted, GrMipMapped mipMapped, GrProtected isProtected,
+ SkISize dimensions, SkBudgeted budgeted, GrMipmapped mipMapped, GrProtected isProtected,
SkImage::CompressionType compressionType, sk_sp<SkData> data) {
ASSERT_SINGLE_OWNER
if (this->isAbandoned()) {
@@ -456,7 +456,7 @@
return nullptr;
}
- GrMipMapsStatus mipMapsStatus = (GrMipMapped::kYes == mipMapped)
+ GrMipMapsStatus mipMapsStatus = (GrMipmapped::kYes == mipMapped)
? GrMipMapsStatus::kValid
: GrMipMapsStatus::kNotAllocated;
@@ -699,7 +699,7 @@
SkISize dimensions,
GrRenderable renderable,
int renderTargetSampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrMipMapsStatus mipMapsStatus,
GrInternalSurfaceFlags surfaceFlags,
SkBackingFit fit,
@@ -815,11 +815,11 @@
if (GrRenderable::kYes == renderable) {
return sk_sp<GrTextureProxy>(new GrTextureRenderTargetProxy(
caps, std::move(callback), format, kLazyDims, renderTargetSampleCnt,
- GrMipMapped::kNo, GrMipMapsStatus::kNotAllocated, SkBackingFit::kApprox,
+ GrMipmapped::kNo, GrMipMapsStatus::kNotAllocated, SkBackingFit::kApprox,
SkBudgeted::kYes, isProtected, surfaceFlags, useAllocator, GrDDLProvider::kNo));
} else {
return sk_sp<GrTextureProxy>(
- new GrTextureProxy(std::move(callback), format, kLazyDims, GrMipMapped::kNo,
+ new GrTextureProxy(std::move(callback), format, kLazyDims, GrMipmapped::kNo,
GrMipMapsStatus::kNotAllocated, SkBackingFit::kApprox,
SkBudgeted::kYes, isProtected, surfaceFlags, useAllocator,
GrDDLProvider::kNo));
diff --git a/src/gpu/GrProxyProvider.h b/src/gpu/GrProxyProvider.h
index e1f681f..a329603 100644
--- a/src/gpu/GrProxyProvider.h
+++ b/src/gpu/GrProxyProvider.h
@@ -75,7 +75,7 @@
* The bitmap is uploaded to the texture proxy assuming a kTopLeft_GrSurfaceOrigin.
*/
sk_sp<GrTextureProxy> createProxyFromBitmap(const SkBitmap&,
- GrMipMapped,
+ GrMipmapped,
SkBackingFit,
SkBudgeted);
@@ -86,7 +86,7 @@
SkISize dimensions,
GrRenderable,
int renderTargetSampleCnt,
- GrMipMapped,
+ GrMipmapped,
SkBackingFit,
SkBudgeted,
GrProtected,
@@ -98,7 +98,7 @@
*/
sk_sp<GrTextureProxy> createCompressedTextureProxy(SkISize dimensions,
SkBudgeted,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
SkImage::CompressionType,
sk_sp<SkData> data);
@@ -151,7 +151,7 @@
using LazyInstantiateCallback = GrSurfaceProxy::LazyInstantiateCallback;
struct TextureInfo {
- GrMipMapped fMipMapped;
+ GrMipmapped fMipMapped;
GrTextureType fTextureType;
};
@@ -170,7 +170,7 @@
SkISize dimensions,
GrRenderable,
int renderTargetSampleCnt,
- GrMipMapped,
+ GrMipmapped,
GrMipMapsStatus,
GrInternalSurfaceFlags,
SkBackingFit,
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 310c498..f439030 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -127,7 +127,7 @@
SkISize dimensions,
const GrBackendFormat& format,
int sampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
GrSurfaceOrigin origin,
SkBudgeted budgeted,
@@ -163,7 +163,7 @@
SkBackingFit fit,
SkISize dimensions,
int sampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
GrSurfaceOrigin origin,
SkBudgeted budgeted,
@@ -222,7 +222,7 @@
SkBackingFit fit,
SkISize dimensions,
int sampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
GrSurfaceOrigin origin,
SkBudgeted budgeted,
@@ -370,11 +370,11 @@
return (this->numSamples() > 1) ? GrAAType::kMSAA : GrAAType::kCoverage;
}
-GrMipMapped GrRenderTargetContext::mipMapped() const {
+GrMipmapped GrRenderTargetContext::mipMapped() const {
if (const GrTextureProxy* proxy = this->asTextureProxy()) {
return proxy->mipMapped();
}
- return GrMipMapped::kNo;
+ return GrMipmapped::kNo;
}
GrOpsTask* GrRenderTargetContext::getOpsTask() {
@@ -2093,7 +2093,7 @@
fit = SkBackingFit::kApprox;
}
auto copy =
- GrSurfaceProxy::Copy(fContext, this->asSurfaceProxy(), this->origin(), GrMipMapped::kNo,
+ GrSurfaceProxy::Copy(fContext, this->asSurfaceProxy(), this->origin(), GrMipmapped::kNo,
copyRect, fit, SkBudgeted::kYes, restrictions.fRectsMustMatch);
SkASSERT(copy);
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h
index 24fbd9d..6fe02c0 100644
--- a/src/gpu/GrRenderTargetContext.h
+++ b/src/gpu/GrRenderTargetContext.h
@@ -72,7 +72,7 @@
SkISize dimensions,
const GrBackendFormat&,
int sampleCnt,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
GrSurfaceOrigin,
SkBudgeted,
@@ -86,7 +86,7 @@
SkBackingFit,
SkISize dimensions,
int sampleCnt = 1,
- GrMipMapped = GrMipMapped::kNo,
+ GrMipmapped = GrMipmapped::kNo,
GrProtected = GrProtected::kNo,
GrSurfaceOrigin = kBottomLeft_GrSurfaceOrigin,
SkBudgeted = SkBudgeted::kYes,
@@ -107,7 +107,7 @@
SkBackingFit,
SkISize dimensions,
int sampleCnt = 1,
- GrMipMapped = GrMipMapped::kNo,
+ GrMipmapped = GrMipmapped::kNo,
GrProtected = GrProtected::kNo,
GrSurfaceOrigin = kBottomLeft_GrSurfaceOrigin,
SkBudgeted = SkBudgeted::kYes,
@@ -545,7 +545,7 @@
int numSamples() const { return this->asRenderTargetProxy()->numSamples(); }
const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; }
bool wrapsVkSecondaryCB() const { return this->asRenderTargetProxy()->wrapsVkSecondaryCB(); }
- GrMipMapped mipMapped() const;
+ GrMipmapped mipMapped() const;
// TODO: See if it makes sense for this to return a const& instead and require the callers to
// make a copy (which refs the proxy) if needed.
diff --git a/src/gpu/GrRenderTargetProxy.cpp b/src/gpu/GrRenderTargetProxy.cpp
index ecddcd6..8e50566 100644
--- a/src/gpu/GrRenderTargetProxy.cpp
+++ b/src/gpu/GrRenderTargetProxy.cpp
@@ -79,7 +79,7 @@
if (this->isLazy()) {
return false;
}
- if (!this->instantiateImpl(resourceProvider, fSampleCnt, GrRenderable::kYes, GrMipMapped::kNo,
+ if (!this->instantiateImpl(resourceProvider, fSampleCnt, GrRenderable::kYes, GrMipmapped::kNo,
nullptr)) {
return false;
}
@@ -100,7 +100,7 @@
sk_sp<GrSurface> GrRenderTargetProxy::createSurface(GrResourceProvider* resourceProvider) const {
sk_sp<GrSurface> surface = this->createSurfaceImpl(resourceProvider, fSampleCnt,
- GrRenderable::kYes, GrMipMapped::kNo);
+ GrRenderable::kYes, GrMipmapped::kNo);
if (!surface) {
return nullptr;
}
@@ -118,7 +118,7 @@
// TODO: do we have enough information to improve this worst case estimate?
return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(),
- colorSamplesPerPixel, GrMipMapped::kNo, !this->priv().isExact());
+ colorSamplesPerPixel, GrMipmapped::kNo, !this->priv().isExact());
}
bool GrRenderTargetProxy::refsWrappedObjects() const {
@@ -138,7 +138,7 @@
this->dimensions(),
SkBackingFit::kExact,
GrRenderable::kYes,
- GrMipMapped::kNo,
+ GrMipmapped::kNo,
this->numSamples(),
this->backendFormat(),
this->isProtected(),
diff --git a/src/gpu/GrRenderTask.cpp b/src/gpu/GrRenderTask.cpp
index 7b294a4..de52086 100644
--- a/src/gpu/GrRenderTask.cpp
+++ b/src/gpu/GrRenderTask.cpp
@@ -72,7 +72,7 @@
this->target(0).origin());
}
GrTextureProxy* textureProxy = this->target(0).asTextureProxy();
- if (textureProxy && GrMipMapped::kYes == textureProxy->mipMapped()) {
+ if (textureProxy && GrMipmapped::kYes == textureProxy->mipMapped()) {
textureProxy->markMipMapsDirty();
}
}
@@ -118,7 +118,7 @@
// Convert from a GrSurface-based dependency to a GrRenderTask one
void GrRenderTask::addDependency(GrDrawingManager* drawingMgr, GrSurfaceProxy* dependedOn,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrTextureResolveManager textureResolveManager,
const GrCaps& caps) {
// If it is still receiving dependencies, this GrRenderTask shouldn't be closed
@@ -129,7 +129,7 @@
if (dependedOnTask == this) {
// self-read - presumably for dst reads. We don't need to do anything in this case. The
// XferProcessor will detect what is happening and insert a texture barrier.
- SkASSERT(GrMipMapped::kNo == mipMapped);
+ SkASSERT(GrMipmapped::kNo == mipMapped);
// We should never attempt a self-read on a surface that has a separate MSAA renderbuffer.
SkASSERT(!dependedOn->requiresManualMSAAResolve());
SkASSERT(!dependedOn->asTextureProxy() ||
@@ -159,12 +159,12 @@
}
GrTextureProxy* textureProxy = dependedOn->asTextureProxy();
- if (GrMipMapped::kYes == mipMapped) {
+ if (GrMipmapped::kYes == mipMapped) {
SkASSERT(textureProxy);
- if (GrMipMapped::kYes != textureProxy->mipMapped()) {
+ if (GrMipmapped::kYes != textureProxy->mipMapped()) {
// There are some cases where we might be given a non-mipmapped texture with a mipmap
// filter. See skbug.com/7094.
- mipMapped = GrMipMapped::kNo;
+ mipMapped = GrMipmapped::kNo;
} else if (textureProxy->mipMapsAreDirty()) {
resolveFlags |= GrSurfaceProxy::ResolveFlags::kMipMaps;
}
diff --git a/src/gpu/GrRenderTask.h b/src/gpu/GrRenderTask.h
index a35fbf8..2f543c4 100644
--- a/src/gpu/GrRenderTask.h
+++ b/src/gpu/GrRenderTask.h
@@ -52,7 +52,7 @@
/*
* Notify this GrRenderTask that it relies on the contents of 'dependedOn'
*/
- void addDependency(GrDrawingManager*, GrSurfaceProxy* dependedOn, GrMipMapped,
+ void addDependency(GrDrawingManager*, GrSurfaceProxy* dependedOn, GrMipmapped,
GrTextureResolveManager, const GrCaps& caps);
/*
@@ -89,7 +89,7 @@
void visitTargetAndSrcProxies_debugOnly(const GrOp::VisitProxyFunc& fn) const {
this->visitProxies_debugOnly(fn);
for (int i = 0; i < this->numTargets(); ++i) {
- fn(this->target(i).proxy(), GrMipMapped::kNo);
+ fn(this->target(i).proxy(), GrMipmapped::kNo);
}
}
#endif
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index 6fe17b5..64e9e5a 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -58,7 +58,7 @@
return nullptr;
}
- GrMipMapped mipMapped = mipLevelCount > 1 ? GrMipMapped::kYes : GrMipMapped::kNo;
+ GrMipmapped mipMapped = mipLevelCount > 1 ? GrMipmapped::kYes : GrMipmapped::kNo;
if (!fCaps->validateSurfaceParams(dimensions, format, renderable, renderTargetSampleCnt,
mipMapped)) {
return nullptr;
@@ -93,7 +93,7 @@
GrRenderable renderable,
int renderTargetSampleCnt,
SkBudgeted budgeted,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected) {
sk_sp<GrTexture> tex(this->refScratchTexture(dimensions, format, renderable,
renderTargetSampleCnt, mipMapped, isProtected));
@@ -124,7 +124,7 @@
return nullptr;
}
if (!fCaps->validateSurfaceParams(dimensions, format, renderable, renderTargetSampleCnt,
- GrMipMapped::kNo)) {
+ GrMipmapped::kNo)) {
return nullptr;
}
@@ -143,7 +143,7 @@
sk_sp<GrTexture> GrResourceProvider::createCompressedTexture(SkISize dimensions,
const GrBackendFormat& format,
SkBudgeted budgeted,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
SkData* data) {
ASSERT_SINGLE_OWNER
@@ -158,7 +158,7 @@
const GrBackendFormat& format,
GrRenderable renderable,
int renderTargetSampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkBudgeted budgeted,
GrProtected isProtected) {
ASSERT_SINGLE_OWNER
@@ -175,7 +175,7 @@
// textures should be created through the createCompressedTexture function.
SkASSERT(!this->caps()->isFormatCompressed(format));
- // TODO: Support GrMipMapped::kYes in scratch texture lookup here.
+ // TODO: Support GrMipmapped::kYes in scratch texture lookup here.
sk_sp<GrTexture> tex =
this->getExactScratch(dimensions, format, renderable, renderTargetSampleCnt, budgeted,
mipMapped, isProtected);
@@ -232,32 +232,32 @@
SkASSERT(!this->caps()->isFormatCompressed(format));
if (!fCaps->validateSurfaceParams(dimensions, format, renderable, renderTargetSampleCnt,
- GrMipMapped::kNo)) {
+ GrMipmapped::kNo)) {
return nullptr;
}
auto copyDimensions = MakeApprox(dimensions);
if (auto tex = this->refScratchTexture(copyDimensions, format, renderable,
- renderTargetSampleCnt, GrMipMapped::kNo, isProtected)) {
+ renderTargetSampleCnt, GrMipmapped::kNo, isProtected)) {
return tex;
}
return fGpu->createTexture(copyDimensions, format, renderable, renderTargetSampleCnt,
- GrMipMapped::kNo, SkBudgeted::kYes, isProtected);
+ GrMipmapped::kNo, SkBudgeted::kYes, isProtected);
}
sk_sp<GrTexture> GrResourceProvider::refScratchTexture(SkISize dimensions,
const GrBackendFormat& format,
GrRenderable renderable,
int renderTargetSampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected) {
ASSERT_SINGLE_OWNER
SkASSERT(!this->isAbandoned());
SkASSERT(!this->caps()->isFormatCompressed(format));
SkASSERT(fCaps->validateSurfaceParams(dimensions, format, renderable, renderTargetSampleCnt,
- GrMipMapped::kNo));
+ GrMipmapped::kNo));
// We could make initial clears work with scratch textures but it is a rare case so we just opt
// to fall back to making a new texture.
diff --git a/src/gpu/GrResourceProvider.h b/src/gpu/GrResourceProvider.h
index 4a5269b..0ba671e 100644
--- a/src/gpu/GrResourceProvider.h
+++ b/src/gpu/GrResourceProvider.h
@@ -70,7 +70,7 @@
const GrBackendFormat& format,
GrRenderable renderable,
int renderTargetSampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkBudgeted budgeted,
GrProtected isProtected);
@@ -111,7 +111,7 @@
sk_sp<GrTexture> createCompressedTexture(SkISize dimensions,
const GrBackendFormat&,
SkBudgeted,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
SkData* data);
@@ -314,7 +314,7 @@
const GrBackendFormat&,
GrRenderable,
int renderTargetSampleCnt,
- GrMipMapped,
+ GrMipmapped,
GrProtected);
/*
@@ -326,7 +326,7 @@
GrRenderable,
int renderTargetSampleCnt,
SkBudgeted,
- GrMipMapped,
+ GrMipmapped,
GrProtected);
// Used to perform any conversions necessary to texel data before creating a texture with
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index 2117df4..d477534 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -156,5 +156,5 @@
bitmap.setImmutable();
GrBitmapTextureMaker maker(context, bitmap, fit);
- return maker.view(GrMipMapped::kNo);
+ return maker.view(GrMipmapped::kNo);
}
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 4c59b58..2e441b5 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -185,7 +185,7 @@
GrSwizzle swizzle = caps->getReadSwizzle(format, GrColorType::kAlpha_8);
auto proxy =
- proxyProvider->createProxy(format, dimensions, GrRenderable::kNo, 1, GrMipMapped::kNo,
+ proxyProvider->createProxy(format, dimensions, GrRenderable::kNo, 1, GrMipmapped::kNo,
fit, SkBudgeted::kYes, GrProtected::kNo);
return {std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle};
}
diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp
index 48a9c4d..8aab652 100644
--- a/src/gpu/GrSurface.cpp
+++ b/src/gpu/GrSurface.cpp
@@ -20,7 +20,7 @@
const GrBackendFormat& format,
SkISize dimensions,
int colorSamplesPerPixel,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
bool binSize) {
// For external formats we do not actually know the real size of the resource so we just return
// 0 here to indicate this.
@@ -37,7 +37,7 @@
SkImage::CompressionType compressionType = GrBackendFormatToCompressionType(format);
if (compressionType != SkImage::CompressionType::kNone) {
colorSize = SkCompressedFormatDataSize(compressionType, dimensions,
- mipMapped == GrMipMapped::kYes);
+ mipMapped == GrMipmapped::kYes);
} else {
colorSize = (size_t)dimensions.width() * dimensions.height() * caps.bytesPerPixel(format);
}
@@ -45,7 +45,7 @@
size_t finalSize = colorSamplesPerPixel * colorSize;
- if (GrMipMapped::kYes == mipMapped) {
+ if (GrMipmapped::kYes == mipMapped) {
// We don't have to worry about the mipmaps being a different dimensions than
// we'd expect because we never change fDesc.fWidth/fHeight.
finalSize += colorSize/3;
diff --git a/src/gpu/GrSurface.h b/src/gpu/GrSurface.h
index 2dd1cf4..213c5d6 100644
--- a/src/gpu/GrSurface.h
+++ b/src/gpu/GrSurface.h
@@ -73,7 +73,7 @@
inline const GrSurfacePriv surfacePriv() const;
static size_t ComputeSize(const GrCaps&, const GrBackendFormat&, SkISize dimensions,
- int colorSamplesPerPixel, GrMipMapped, bool binSize = false);
+ int colorSamplesPerPixel, GrMipmapped, bool binSize = false);
/**
* The pixel values of this surface cannot be modified (e.g. doesn't support write pixels or
diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp
index abe083e..25b95b0 100644
--- a/src/gpu/GrSurfaceContext.cpp
+++ b/src/gpu/GrSurfaceContext.cpp
@@ -71,7 +71,7 @@
const GrBackendFormat& format,
GrRenderable renderable,
int renderTargetSampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
GrSurfaceOrigin origin,
GrColorType colorType,
@@ -213,7 +213,7 @@
auto tempCtx = GrRenderTargetContext::Make(
direct, colorType, std::move(cs), SkBackingFit::kApprox, dstInfo.dimensions(),
- 1, GrMipMapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
+ 1, GrMipmapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
if (!tempCtx) {
return false;
}
@@ -388,7 +388,7 @@
GrSurfaceOrigin tempOrigin =
this->asRenderTargetContext() ? kTopLeft_GrSurfaceOrigin : this->origin();
auto tempProxy = direct->priv().proxyProvider()->createProxy(
- format, srcInfo.dimensions(), GrRenderable::kNo, 1, GrMipMapped::kNo,
+ format, srcInfo.dimensions(), GrRenderable::kNo, 1, GrMipmapped::kNo,
SkBackingFit::kApprox, SkBudgeted::kYes, GrProtected::kNo);
if (!tempProxy) {
return false;
@@ -558,7 +558,7 @@
// If the src is not texturable first try to make a copy to a texture.
if (!texProxyView.asTextureProxy()) {
texProxyView =
- GrSurfaceProxyView::Copy(fContext, texProxyView, GrMipMapped::kNo, srcRect,
+ GrSurfaceProxyView::Copy(fContext, texProxyView, GrMipmapped::kNo, srcRect,
SkBackingFit::kApprox, SkBudgeted::kNo);
if (!texProxyView) {
callback(context, nullptr);
@@ -569,7 +569,7 @@
}
tempRTC = GrRenderTargetContext::Make(direct, this->colorInfo().colorType(),
info.refColorSpace(), SkBackingFit::kApprox,
- srcRect.size(), 1, GrMipMapped::kNo,
+ srcRect.size(), 1, GrMipmapped::kNo,
GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
if (!tempRTC) {
callback(context, nullptr);
@@ -776,7 +776,7 @@
} else {
srcView = this->readSurfaceView();
if (!srcView.asTextureProxy()) {
- srcView = GrSurfaceProxyView::Copy(fContext, std::move(srcView), GrMipMapped::kNo,
+ srcView = GrSurfaceProxyView::Copy(fContext, std::move(srcView), GrMipmapped::kNo,
srcRect, SkBackingFit::kApprox, SkBudgeted::kYes);
if (!srcView) {
// If we can't get a texture copy of the contents then give up.
@@ -794,7 +794,7 @@
SkRect srcRectToDraw = SkRect::MakeXYWH(x, y, srcRect.width(), srcRect.height());
auto tempRTC = GrRenderTargetContext::Make(
direct, this->colorInfo().colorType(), dstColorSpace, SkBackingFit::kApprox,
- dstSize, 1, GrMipMapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
+ dstSize, 1, GrMipmapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
if (!tempRTC) {
callback(context, nullptr);
return;
@@ -812,15 +812,15 @@
auto yRTC = GrRenderTargetContext::MakeWithFallback(
direct, GrColorType::kAlpha_8, dstColorSpace, SkBackingFit::kApprox, dstSize, 1,
- GrMipMapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
+ GrMipmapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
int halfW = dstSize.width() /2;
int halfH = dstSize.height()/2;
auto uRTC = GrRenderTargetContext::MakeWithFallback(
direct, GrColorType::kAlpha_8, dstColorSpace, SkBackingFit::kApprox, {halfW, halfH}, 1,
- GrMipMapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
+ GrMipmapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
auto vRTC = GrRenderTargetContext::MakeWithFallback(
direct, GrColorType::kAlpha_8, dstColorSpace, SkBackingFit::kApprox, {halfW, halfH}, 1,
- GrMipMapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
+ GrMipmapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
if (!yRTC || !uRTC || !vRTC) {
callback(context, nullptr);
return;
@@ -1029,7 +1029,7 @@
GrSurfaceProxyView texView = this->readSurfaceView();
SkAlphaType srcAlphaType = this->colorInfo().alphaType();
if (!texView.asTextureProxy()) {
- texView = GrSurfaceProxyView::Copy(fContext, std::move(texView), GrMipMapped::kNo, srcRect,
+ texView = GrSurfaceProxyView::Copy(fContext, std::move(texView), GrMipmapped::kNo, srcRect,
SkBackingFit::kApprox, SkBudgeted::kNo);
if (!texView) {
return nullptr;
@@ -1053,7 +1053,7 @@
// We'll fall back to kRGBA_8888 if half float not supported.
auto linearRTC = GrRenderTargetContext::MakeWithFallback(
fContext, GrColorType::kRGBA_F16, cs, SkBackingFit::kApprox, srcRect.size(), 1,
- GrMipMapped::kNo, GrProtected::kNo, origin);
+ GrMipmapped::kNo, GrProtected::kNo, origin);
if (!linearRTC) {
return nullptr;
}
@@ -1097,7 +1097,7 @@
}
tempB = GrRenderTargetContext::MakeWithFallback(fContext, colorType, std::move(cs),
SkBackingFit::kApprox, nextDims, 1,
- GrMipMapped::kNo, GrProtected::kNo, origin);
+ GrMipmapped::kNo, GrProtected::kNo, origin);
if (!tempB) {
return nullptr;
}
diff --git a/src/gpu/GrSurfaceContext.h b/src/gpu/GrSurfaceContext.h
index 82307b5..b327b88 100644
--- a/src/gpu/GrSurfaceContext.h
+++ b/src/gpu/GrSurfaceContext.h
@@ -46,7 +46,7 @@
static std::unique_ptr<GrSurfaceContext> Make(GrRecordingContext*, SkISize dimensions,
const GrBackendFormat&, GrRenderable,
- int renderTargetSampleCnt, GrMipMapped,
+ int renderTargetSampleCnt, GrMipmapped,
GrProtected, GrSurfaceOrigin, GrColorType,
SkAlphaType, sk_sp<SkColorSpace>, SkBackingFit,
SkBudgeted);
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index 1fcacf6..de0ecc0 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -111,8 +111,8 @@
sk_sp<GrSurface> GrSurfaceProxy::createSurfaceImpl(GrResourceProvider* resourceProvider,
int sampleCnt,
GrRenderable renderable,
- GrMipMapped mipMapped) const {
- SkASSERT(mipMapped == GrMipMapped::kNo || fFit == SkBackingFit::kExact);
+ GrMipmapped mipMapped) const {
+ SkASSERT(mipMapped == GrMipmapped::kNo || fFit == SkBackingFit::kExact);
SkASSERT(!this->isLazy());
SkASSERT(!fTarget);
@@ -165,7 +165,7 @@
}
bool GrSurfaceProxy::instantiateImpl(GrResourceProvider* resourceProvider, int sampleCnt,
- GrRenderable renderable, GrMipMapped mipMapped,
+ GrRenderable renderable, GrMipmapped mipMapped,
const GrUniqueKey* uniqueKey) {
SkASSERT(!this->isLazy());
if (fTarget) {
@@ -207,7 +207,7 @@
}
const GrTextureProxy* tp = this->asTextureProxy();
- GrMipMapped mipMapped = GrMipMapped::kNo;
+ GrMipmapped mipMapped = GrMipmapped::kNo;
if (tp) {
mipMapped = tp->mipMapped();
}
@@ -249,7 +249,7 @@
sk_sp<GrSurfaceProxy> GrSurfaceProxy::Copy(GrRecordingContext* context,
GrSurfaceProxy* src,
GrSurfaceOrigin origin,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkIRect srcRect,
SkBackingFit fit,
SkBudgeted budgeted,
@@ -300,7 +300,7 @@
sk_sp<GrSurfaceProxy> GrSurfaceProxy::Copy(GrRecordingContext* context,
GrSurfaceProxy* src,
GrSurfaceOrigin origin,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkBackingFit fit,
SkBudgeted budgeted) {
SkASSERT(!src->isFullyLazy());
diff --git a/src/gpu/GrSurfaceProxy.h b/src/gpu/GrSurfaceProxy.h
index f30e21d..93e96f7 100644
--- a/src/gpu/GrSurfaceProxy.h
+++ b/src/gpu/GrSurfaceProxy.h
@@ -70,7 +70,7 @@
SkISize fDimensions;
SkBackingFit fFit;
GrRenderable fRenderable;
- GrMipMapped fMipMapped;
+ GrMipmapped fMipMapped;
int fSampleCnt;
const GrBackendFormat& fFormat;
GrProtected fProtected;
@@ -302,7 +302,7 @@
static sk_sp<GrSurfaceProxy> Copy(GrRecordingContext*,
GrSurfaceProxy* src,
GrSurfaceOrigin,
- GrMipMapped,
+ GrMipmapped,
SkIRect srcRect,
SkBackingFit,
SkBudgeted,
@@ -312,7 +312,7 @@
static sk_sp<GrSurfaceProxy> Copy(GrRecordingContext*,
GrSurfaceProxy* src,
GrSurfaceOrigin,
- GrMipMapped,
+ GrMipmapped,
SkBackingFit,
SkBudgeted);
@@ -368,7 +368,7 @@
void assign(sk_sp<GrSurface> surface);
sk_sp<GrSurface> createSurfaceImpl(GrResourceProvider*, int sampleCnt, GrRenderable,
- GrMipMapped) const;
+ GrMipmapped) const;
// Once the dimensions of a fully-lazy proxy are decided, and before it gets instantiated, the
// client can use this optional method to specify the proxy's dimensions. (A proxy's dimensions
@@ -381,7 +381,7 @@
}
bool instantiateImpl(GrResourceProvider* resourceProvider, int sampleCnt, GrRenderable,
- GrMipMapped, const GrUniqueKey*);
+ GrMipmapped, const GrUniqueKey*);
// For deferred proxies this will be null until the proxy is instantiated.
// For wrapped proxies it will point to the wrapped resource.
diff --git a/src/gpu/GrSurfaceProxyView.h b/src/gpu/GrSurfaceProxyView.h
index 2a167c5..6d26bf9 100644
--- a/src/gpu/GrSurfaceProxyView.h
+++ b/src/gpu/GrSurfaceProxyView.h
@@ -80,7 +80,7 @@
// the same origin and swizzle as the src view.
static GrSurfaceProxyView Copy(GrRecordingContext* context,
GrSurfaceProxyView src,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkIRect srcRect,
SkBackingFit fit,
SkBudgeted budgeted) {
diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index 0c18e00..3cf9de6 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -105,7 +105,7 @@
SkISize dimensions,
GrRenderable renderable,
int sampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
GrScratchKey* key) {
static const GrScratchKey::ResourceType kType = GrScratchKey::GenerateResourceType();
diff --git a/src/gpu/GrTextureAdjuster.cpp b/src/gpu/GrTextureAdjuster.cpp
index 11bb20e..e5f1a64 100644
--- a/src/gpu/GrTextureAdjuster.cpp
+++ b/src/gpu/GrTextureAdjuster.cpp
@@ -49,7 +49,7 @@
return copy;
}
-GrSurfaceProxyView GrTextureAdjuster::onView(GrMipMapped mipMapped) {
+GrSurfaceProxyView GrTextureAdjuster::onView(GrMipmapped mipMapped) {
if (this->context()->abandoned()) {
// The texture was abandoned.
return {};
@@ -60,7 +60,7 @@
GrTextureProxy* texProxy = fOriginal.asTextureProxy();
SkASSERT(texProxy);
- if (mipMapped == GrMipMapped::kNo || texProxy->mipMapped() == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kNo || texProxy->mipMapped() == GrMipmapped::kYes) {
return fOriginal;
}
@@ -91,5 +91,5 @@
GrSamplerState::WrapMode wrapX,
GrSamplerState::WrapMode wrapY) {
return this->createBicubicFragmentProcessorForView(
- this->view(GrMipMapped::kNo), textureMatrix, subset, domain, wrapX, wrapY);
+ this->view(GrMipmapped::kNo), textureMatrix, subset, domain, wrapX, wrapY);
}
diff --git a/src/gpu/GrTextureAdjuster.h b/src/gpu/GrTextureAdjuster.h
index 0494b21..37816ce 100644
--- a/src/gpu/GrTextureAdjuster.h
+++ b/src/gpu/GrTextureAdjuster.h
@@ -36,7 +36,7 @@
GrSamplerState::WrapMode wrapY) override;
private:
- GrSurfaceProxyView onView(GrMipMapped) override;
+ GrSurfaceProxyView onView(GrMipmapped) override;
GrSurfaceProxyView makeMippedCopy();
diff --git a/src/gpu/GrTextureMaker.cpp b/src/gpu/GrTextureMaker.cpp
index f02365e..637002e 100644
--- a/src/gpu/GrTextureMaker.cpp
+++ b/src/gpu/GrTextureMaker.cpp
@@ -14,7 +14,7 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/SkGr.h"
-GrSurfaceProxyView GrTextureMaker::onView(GrMipMapped mipMapped) {
+GrSurfaceProxyView GrTextureMaker::onView(GrMipmapped mipMapped) {
if (this->width() > this->context()->priv().caps()->maxTextureSize() ||
this->height() > this->context()->priv().caps()->maxTextureSize()) {
return {};
@@ -39,5 +39,5 @@
GrSamplerState::WrapMode wrapX,
GrSamplerState::WrapMode wrapY) {
return this->createBicubicFragmentProcessorForView(
- this->view(GrMipMapped::kNo), textureMatrix, subset, domain, wrapX, wrapY);
+ this->view(GrMipmapped::kNo), textureMatrix, subset, domain, wrapX, wrapY);
}
diff --git a/src/gpu/GrTextureMaker.h b/src/gpu/GrTextureMaker.h
index 4ce4cdf..3a47fa0 100644
--- a/src/gpu/GrTextureMaker.h
+++ b/src/gpu/GrTextureMaker.h
@@ -37,9 +37,9 @@
* Return the maker's "original" texture. It is the responsibility of the maker to handle any
* caching of the original if desired.
*/
- virtual GrSurfaceProxyView refOriginalTextureProxyView(GrMipMapped) = 0;
+ virtual GrSurfaceProxyView refOriginalTextureProxyView(GrMipmapped) = 0;
- GrSurfaceProxyView onView(GrMipMapped) final;
+ GrSurfaceProxyView onView(GrMipmapped) final;
typedef GrTextureProducer INHERITED;
};
diff --git a/src/gpu/GrTexturePriv.h b/src/gpu/GrTexturePriv.h
index 085e78d..99a918f 100644
--- a/src/gpu/GrTexturePriv.h
+++ b/src/gpu/GrTexturePriv.h
@@ -32,11 +32,11 @@
return GrMipMapsStatus::kValid != this->mipMapsStatus();
}
- GrMipMapped mipMapped() const {
+ GrMipmapped mipMapped() const {
if (GrMipMapsStatus::kNotAllocated != this->mipMapsStatus()) {
- return GrMipMapped::kYes;
+ return GrMipmapped::kYes;
}
- return GrMipMapped::kNo;
+ return GrMipmapped::kNo;
}
int maxMipMapLevel() const {
@@ -53,7 +53,7 @@
SkISize dimensions,
GrRenderable,
int sampleCnt,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
GrScratchKey* key);
diff --git a/src/gpu/GrTextureProducer.cpp b/src/gpu/GrTextureProducer.cpp
index 9fc714a..e5b14cb 100644
--- a/src/gpu/GrTextureProducer.cpp
+++ b/src/gpu/GrTextureProducer.cpp
@@ -85,25 +85,25 @@
}
}
-GrSurfaceProxyView GrTextureProducer::view(GrMipMapped mipMapped) {
+GrSurfaceProxyView GrTextureProducer::view(GrMipmapped mipMapped) {
const GrCaps* caps = this->context()->priv().caps();
// Sanitize the MIP map request.
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
if ((this->width() == 1 && this->height() == 1) || !caps->mipMapSupport()) {
- mipMapped = GrMipMapped::kNo;
+ mipMapped = GrMipmapped::kNo;
}
}
auto result = this->onView(mipMapped);
// Check to make sure if we requested MIPs that the returned texture has MIP maps or the format
// is not copyable.
- SkASSERT(!result || mipMapped == GrMipMapped::kNo ||
- result.asTextureProxy()->mipMapped() == GrMipMapped::kYes ||
+ SkASSERT(!result || mipMapped == GrMipmapped::kNo ||
+ result.asTextureProxy()->mipMapped() == GrMipmapped::kYes ||
!caps->isFormatCopyable(result.proxy()->backendFormat()));
return result;
}
GrSurfaceProxyView GrTextureProducer::view(GrSamplerState::Filter filter) {
- auto mipMapped = filter == GrSamplerState::Filter::kMipMap ? GrMipMapped::kYes
- : GrMipMapped::kNo;
+ auto mipMapped = filter == GrSamplerState::Filter::kMipMap ? GrMipmapped::kYes
+ : GrMipmapped::kNo;
return this->view(mipMapped);
}
diff --git a/src/gpu/GrTextureProducer.h b/src/gpu/GrTextureProducer.h
index f97605e..750d0ee 100644
--- a/src/gpu/GrTextureProducer.h
+++ b/src/gpu/GrTextureProducer.h
@@ -86,7 +86,7 @@
* base on caps, format, and whether the texture is 1x1. A non-MIP mapped request may still
* receive a MIP mapped texture (if that is what is available in the cache).
*/
- GrSurfaceProxyView view(GrMipMapped);
+ GrSurfaceProxyView view(GrMipmapped);
/** Helper version of above that determines MIP mapping requirement from Filter. */
GrSurfaceProxyView view(GrSamplerState::Filter);
@@ -125,7 +125,7 @@
GrRecordingContext* context() const { return fContext; }
private:
- virtual GrSurfaceProxyView onView(GrMipMapped) = 0;
+ virtual GrSurfaceProxyView onView(GrMipmapped) = 0;
GrRecordingContext* fContext;
const GrImageInfo fImageInfo;
diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp
index f207e75..80a3b5f 100644
--- a/src/gpu/GrTextureProxy.cpp
+++ b/src/gpu/GrTextureProxy.cpp
@@ -18,7 +18,7 @@
// Deferred version - no data
GrTextureProxy::GrTextureProxy(const GrBackendFormat& format,
SkISize dimensions,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrMipMapsStatus mipMapsStatus,
SkBackingFit fit,
SkBudgeted budgeted,
@@ -40,7 +40,7 @@
GrTextureProxy::GrTextureProxy(LazyInstantiateCallback&& callback,
const GrBackendFormat& format,
SkISize dimensions,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrMipMapsStatus mipMapsStatus,
SkBackingFit fit,
SkBudgeted budgeted,
@@ -135,7 +135,7 @@
fTextureProxy->fDeferredUploader.reset();
}
-GrMipMapped GrTextureProxy::mipMapped() const {
+GrMipmapped GrTextureProxy::mipMapped() const {
if (this->isInstantiated()) {
return this->peekTexture()->texturePriv().mipMapped();
}
@@ -209,8 +209,8 @@
// Anything that is checked here should be duplicated in GrTextureRenderTargetProxy's version
SkASSERT(surface->asTexture());
// It is possible to fulfill a non-mipmapped proxy with a mipmapped texture.
- SkASSERT(GrMipMapped::kNo == this->proxyMipMapped() ||
- GrMipMapped::kYes == surface->asTexture()->texturePriv().mipMapped());
+ SkASSERT(GrMipmapped::kNo == this->proxyMipMapped() ||
+ GrMipmapped::kYes == surface->asTexture()->texturePriv().mipMapped());
SkASSERT(surface->asTexture()->texturePriv().textureType() == this->textureType());
diff --git a/src/gpu/GrTextureProxy.h b/src/gpu/GrTextureProxy.h
index 7781cc2..2fa7b06 100644
--- a/src/gpu/GrTextureProxy.h
+++ b/src/gpu/GrTextureProxy.h
@@ -31,25 +31,25 @@
// claim to not need mips at creation time, but the instantiation happens to give us a mipped
// target. In that case we should use that for our benefit to avoid possible copies/mip
// generation later.
- GrMipMapped mipMapped() const;
+ GrMipmapped mipMapped() const;
bool mipMapsAreDirty() const {
- SkASSERT((GrMipMapped::kNo == fMipMapped) ==
+ SkASSERT((GrMipmapped::kNo == fMipMapped) ==
(GrMipMapsStatus::kNotAllocated == fMipMapsStatus));
- return GrMipMapped::kYes == fMipMapped && GrMipMapsStatus::kValid != fMipMapsStatus;
+ return GrMipmapped::kYes == fMipMapped && GrMipMapsStatus::kValid != fMipMapsStatus;
}
void markMipMapsDirty() {
- SkASSERT(GrMipMapped::kYes == fMipMapped);
+ SkASSERT(GrMipmapped::kYes == fMipMapped);
fMipMapsStatus = GrMipMapsStatus::kDirty;
}
void markMipMapsClean() {
- SkASSERT(GrMipMapped::kYes == fMipMapped);
+ SkASSERT(GrMipmapped::kYes == fMipMapped);
fMipMapsStatus = GrMipMapsStatus::kValid;
}
- // Returns the GrMipMapped value of the proxy from creation time regardless of whether it has
+ // Returns the GrMipmapped value of the proxy from creation time regardless of whether it has
// been instantiated or not.
- GrMipMapped proxyMipMapped() const { return fMipMapped; }
+ GrMipmapped proxyMipMapped() const { return fMipMapped; }
GrTextureType textureType() const { return this->backendFormat().textureType(); }
@@ -113,7 +113,7 @@
// Deferred version - no data.
GrTextureProxy(const GrBackendFormat&,
SkISize,
- GrMipMapped,
+ GrMipmapped,
GrMipMapsStatus,
SkBackingFit,
SkBudgeted,
@@ -135,7 +135,7 @@
GrTextureProxy(LazyInstantiateCallback&&,
const GrBackendFormat&,
SkISize,
- GrMipMapped,
+ GrMipmapped,
GrMipMapsStatus,
SkBackingFit,
SkBudgeted,
@@ -165,7 +165,7 @@
// that particular class don't require it. Changing the size of this object can move the start
// address of other types, leading to this problem.
- GrMipMapped fMipMapped;
+ GrMipmapped fMipMapped;
// This tracks the mipmap status at the proxy level and is thus somewhat distinct from the
// backing GrTexture's mipmap status. In particular, this status is used to determine when
diff --git a/src/gpu/GrTextureRenderTargetProxy.cpp b/src/gpu/GrTextureRenderTargetProxy.cpp
index f42629c..82a67d4 100644
--- a/src/gpu/GrTextureRenderTargetProxy.cpp
+++ b/src/gpu/GrTextureRenderTargetProxy.cpp
@@ -28,7 +28,7 @@
const GrBackendFormat& format,
SkISize dimensions,
int sampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrMipMapsStatus mipMapsStatus,
SkBackingFit fit,
SkBudgeted budgeted,
@@ -51,7 +51,7 @@
const GrBackendFormat& format,
SkISize dimensions,
int sampleCnt,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrMipMapsStatus mipMapsStatus,
SkBackingFit fit,
SkBudgeted budgeted,
@@ -177,8 +177,8 @@
void GrTextureRenderTargetProxy::onValidateSurface(const GrSurface* surface) {
// Anything checked here should also be checking the GrTextureProxy version
SkASSERT(surface->asTexture());
- SkASSERT(GrMipMapped::kNo == this->proxyMipMapped() ||
- GrMipMapped::kYes == surface->asTexture()->texturePriv().mipMapped());
+ SkASSERT(GrMipmapped::kNo == this->proxyMipMapped() ||
+ GrMipmapped::kYes == surface->asTexture()->texturePriv().mipMapped());
// Anything checked here should also be checking the GrRenderTargetProxy version
SkASSERT(surface->asRenderTarget());
diff --git a/src/gpu/GrTextureRenderTargetProxy.h b/src/gpu/GrTextureRenderTargetProxy.h
index 4eb81f2..9ea5396 100644
--- a/src/gpu/GrTextureRenderTargetProxy.h
+++ b/src/gpu/GrTextureRenderTargetProxy.h
@@ -32,7 +32,7 @@
const GrBackendFormat&,
SkISize,
int sampleCnt,
- GrMipMapped,
+ GrMipmapped,
GrMipMapsStatus,
SkBackingFit,
SkBudgeted,
@@ -47,7 +47,7 @@
const GrBackendFormat&,
SkISize,
int sampleCnt,
- GrMipMapped,
+ GrMipmapped,
GrMipMapsStatus,
SkBackingFit,
SkBudgeted,
diff --git a/src/gpu/GrTextureResolveRenderTask.cpp b/src/gpu/GrTextureResolveRenderTask.cpp
index 8fa3f32..021c188 100644
--- a/src/gpu/GrTextureResolveRenderTask.cpp
+++ b/src/gpu/GrTextureResolveRenderTask.cpp
@@ -37,14 +37,14 @@
if (GrSurfaceProxy::ResolveFlags::kMipMaps & flags) {
GrTextureProxy* textureProxy = proxy->asTextureProxy();
- SkASSERT(GrMipMapped::kYes == textureProxy->mipMapped());
+ SkASSERT(GrMipmapped::kYes == textureProxy->mipMapped());
SkASSERT(textureProxy->mipMapsAreDirty());
textureProxy->markMipMapsClean();
}
// Add the proxy as a dependency: We will read the existing contents of this texture while
// generating mipmap levels and/or resolving MSAA.
- this->addDependency(drawingMgr, proxy, GrMipMapped::kNo,
+ this->addDependency(drawingMgr, proxy, GrMipmapped::kNo,
GrTextureResolveManager(nullptr), caps);
this->addTarget(drawingMgr, GrSurfaceProxyView(std::move(proxyRef)));
}
diff --git a/src/gpu/GrTransferFromRenderTask.h b/src/gpu/GrTransferFromRenderTask.h
index 93a0f7a..46ac253 100644
--- a/src/gpu/GrTransferFromRenderTask.h
+++ b/src/gpu/GrTransferFromRenderTask.h
@@ -44,7 +44,7 @@
#ifdef SK_DEBUG
const char* name() const final { return "TransferFrom"; }
void visitProxies_debugOnly(const GrOp::VisitProxyFunc& fn) const override {
- fn(fSrcProxy.get(), GrMipMapped::kNo);
+ fn(fSrcProxy.get(), GrMipmapped::kNo);
}
#endif
diff --git a/src/gpu/GrYUVProvider.cpp b/src/gpu/GrYUVProvider.cpp
index def05f6..14b177c 100644
--- a/src/gpu/GrYUVProvider.cpp
+++ b/src/gpu/GrYUVProvider.cpp
@@ -153,7 +153,7 @@
bitmap.setImmutable();
GrBitmapTextureMaker maker(ctx, bitmap, fit);
- yuvViews[i] = maker.view(GrMipMapped::kNo);
+ yuvViews[i] = maker.view(GrMipmapped::kNo);
if (!yuvViews[i]) {
return {};
@@ -164,7 +164,7 @@
// TODO: investigate preallocating mip maps here
auto renderTargetContext = GrRenderTargetContext::Make(
- ctx, colorType, nullptr, SkBackingFit::kExact, dimensions, 1, GrMipMapped::kNo,
+ ctx, colorType, nullptr, SkBackingFit::kExact, dimensions, 1, GrMipmapped::kNo,
GrProtected::kNo, kTopLeft_GrSurfaceOrigin, budgeted);
if (!renderTargetContext) {
return {};
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index de34a12..30e2c74 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -95,7 +95,7 @@
sk_sp<SkGpuDevice> SkGpuDevice::Make(GrRecordingContext* context, SkBudgeted budgeted,
const SkImageInfo& info, int sampleCount,
GrSurfaceOrigin origin, const SkSurfaceProps* props,
- GrMipMapped mipMapped, InitContents init) {
+ GrMipmapped mipMapped, InitContents init) {
unsigned flags;
if (!context->colorTypeSupportedAsSurface(info.colorType()) ||
!CheckAlphaTypeAndGetFlags(&info, init, &flags)) {
@@ -144,7 +144,7 @@
int sampleCount,
GrSurfaceOrigin origin,
const SkSurfaceProps* surfaceProps,
- GrMipMapped mipMapped) {
+ GrMipmapped mipMapped) {
if (!context) {
return nullptr;
}
@@ -762,7 +762,7 @@
// texture that matches the device contents
view = GrSurfaceProxyView::Copy(fContext.get(),
std::move(view),
- GrMipMapped::kNo, // Don't auto generate mips
+ GrMipmapped::kNo, // Don't auto generate mips
subset,
SkBackingFit::kApprox,
SkBudgeted::kYes); // Always budgeted
@@ -1064,7 +1064,7 @@
auto rtc = GrRenderTargetContext::MakeWithFallback(
fContext.get(), SkColorTypeToGrColorType(cinfo.fInfo.colorType()),
fRenderTargetContext->colorInfo().refColorSpace(), fit, cinfo.fInfo.dimensions(),
- fRenderTargetContext->numSamples(), GrMipMapped::kNo,
+ fRenderTargetContext->numSamples(), GrMipmapped::kNo,
fRenderTargetContext->asSurfaceProxy()->isProtected(), kBottomLeft_GrSurfaceOrigin,
SkBudgeted::kYes, &props);
if (!rtc) {
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h
index 31738e8..d4e33a1 100644
--- a/src/gpu/SkGpuDevice.h
+++ b/src/gpu/SkGpuDevice.h
@@ -56,7 +56,7 @@
*/
static sk_sp<SkGpuDevice> Make(GrRecordingContext*, SkBudgeted, const SkImageInfo&,
int sampleCount, GrSurfaceOrigin, const SkSurfaceProps*,
- GrMipMapped mipMapped, InitContents);
+ GrMipmapped mipMapped, InitContents);
~SkGpuDevice() override {}
@@ -176,7 +176,7 @@
int sampleCount,
GrSurfaceOrigin,
const SkSurfaceProps*,
- GrMipMapped);
+ GrMipmapped);
friend class GrAtlasTextContext;
friend class SkSurface_Gpu; // for access to surfaceProps
diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index ad9569d..32a48c9 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -412,7 +412,7 @@
can_use_draw_texture(paint)) {
// We've done enough checks above to allow us to pass ClampNearest() and not check for
// scaling adjustments.
- auto view = producer->view(GrMipMapped::kNo);
+ auto view = producer->view(GrMipmapped::kNo);
if (!view) {
return;
}
@@ -832,7 +832,7 @@
uint32_t uniqueID;
view = image->refPinnedView(this->recordingContext(), &uniqueID);
if (!view) {
- view = image->refView(this->recordingContext(), GrMipMapped::kNo);
+ view = image->refView(this->recordingContext(), GrMipmapped::kNo);
}
}
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index c545891..c50bc6a 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -99,7 +99,7 @@
if (!ctx->priv().caps()->isFormatCopyable(baseProxy->backendFormat())) {
return {};
}
- auto copy = GrSurfaceProxy::Copy(ctx, baseProxy, origin, GrMipMapped::kYes,
+ auto copy = GrSurfaceProxy::Copy(ctx, baseProxy, origin, GrMipmapped::kYes,
SkBackingFit::kExact, budgeted);
if (!copy) {
return {};
@@ -118,7 +118,7 @@
}
GrSurfaceProxyView GrRefCachedBitmapView(GrRecordingContext* ctx, const SkBitmap& bitmap,
- GrMipMapped mipMapped) {
+ GrMipmapped mipMapped) {
GrBitmapTextureMaker maker(ctx, bitmap, GrImageTexGenPolicy::kDraw);
return maker.view(mipMapped);
}
@@ -130,7 +130,7 @@
}
GrBitmapTextureMaker maker(context, bitmap, GrImageTexGenPolicy::kDraw);
- return maker.view(GrMipMapped::kNo);
+ return maker.view(GrMipmapped::kNo);
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/SkGr.h b/src/gpu/SkGr.h
index 6ed5772..bfb7574 100644
--- a/src/gpu/SkGr.h
+++ b/src/gpu/SkGr.h
@@ -180,10 +180,10 @@
/**
* Returns a view that wraps a texture representing the bitmap. The texture is inserted into the
* cache (unless the bitmap is marked volatile and can be retrieved again via this function.
- * A MIP mapped texture may be returned even when GrMipMapped is kNo. The function will succeed
- * with a non-MIP mapped texture if GrMipMapped is kYes but MIP mapping is not supported.
+ * A MIP mapped texture may be returned even when GrMipmapped is kNo. The function will succeed
+ * with a non-MIP mapped texture if GrMipmapped is kYes but MIP mapping is not supported.
*/
-GrSurfaceProxyView GrRefCachedBitmapView(GrRecordingContext*, const SkBitmap&, GrMipMapped);
+GrSurfaceProxyView GrRefCachedBitmapView(GrRecordingContext*, const SkBitmap&, GrMipmapped);
/**
* Creates a new texture with mipmap levels and copies the baseProxy into the base layer.
diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.h b/src/gpu/ccpr/GrCCDrawPathsOp.h
index 92c37ed..f4b389e 100644
--- a/src/gpu/ccpr/GrCCDrawPathsOp.h
+++ b/src/gpu/ccpr/GrCCDrawPathsOp.h
@@ -40,7 +40,7 @@
CombineResult onCombineIfPossible(GrOp*, GrRecordingContext::Arenas*, const GrCaps&) override;
void visitProxies(const VisitProxyFunc& fn) const override {
for (const auto& range : fInstanceRanges) {
- fn(range.fAtlasProxy, GrMipMapped::kNo);
+ fn(range.fAtlasProxy, GrMipmapped::kNo);
}
fProcessors.visitProxies(fn);
}
diff --git a/src/gpu/ccpr/GrCCPerFlushResources.cpp b/src/gpu/ccpr/GrCCPerFlushResources.cpp
index a8803ca..cefd2db 100644
--- a/src/gpu/ccpr/GrCCPerFlushResources.cpp
+++ b/src/gpu/ccpr/GrCCPerFlushResources.cpp
@@ -82,7 +82,7 @@
const char* name() const override { return "CopyAtlasOp (CCPR)"; }
void visitProxies(const VisitProxyFunc& fn) const override {
- fn(fSrcProxy.get(), GrMipMapped::kNo);
+ fn(fSrcProxy.get(), GrMipmapped::kNo);
}
void onExecute(GrOpFlushState* flushState, const SkRect& chainBounds) override {
diff --git a/src/gpu/d3d/GrD3DGpu.cpp b/src/gpu/d3d/GrD3DGpu.cpp
index 850e6a0..f9f0202 100644
--- a/src/gpu/d3d/GrD3DGpu.cpp
+++ b/src/gpu/d3d/GrD3DGpu.cpp
@@ -311,7 +311,7 @@
sk_sp<GrTexture> GrD3DGpu::onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat& format,
SkBudgeted budgeted,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
const void* data, size_t dataSize) {
DXGI_FORMAT dxgiFormat;
@@ -320,10 +320,10 @@
SkDEBUGCODE(SkImage::CompressionType compression = GrBackendFormatToCompressionType(format));
SkASSERT(dataSize == SkCompressedFormatDataSize(compression, dimensions,
- mipMapped == GrMipMapped::kYes));
+ mipMapped == GrMipmapped::kYes));
int mipLevelCount = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
mipLevelCount = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height()) + 1;
}
GrMipMapsStatus mipMapsStatus = mipLevelCount > 1 ? GrMipMapsStatus::kValid
@@ -914,7 +914,7 @@
SkISize dimensions,
GrTexturable texturable,
GrRenderable renderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrD3DTextureResourceInfo* info,
GrProtected isProtected) {
SkASSERT(texturable == GrTexturable::kYes || renderable == GrRenderable::kYes);
@@ -932,7 +932,7 @@
}
int numMipLevels = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
numMipLevels = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height()) + 1;
}
@@ -983,7 +983,7 @@
GrBackendTexture GrD3DGpu::onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat& format,
GrRenderable renderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected) {
this->handleDirtyContext();
@@ -1076,7 +1076,7 @@
SkASSERT(d3dResource);
D3D12_RESOURCE_DESC desc = d3dResource->GetDesc();
unsigned int mipLevelCount = 1;
- if (backendTexture.fMipMapped == GrMipMapped::kYes) {
+ if (backendTexture.fMipMapped == GrMipmapped::kYes) {
mipLevelCount = SkMipmap::ComputeLevelCount(backendTexture.dimensions().width(),
backendTexture.dimensions().height()) + 1;
}
@@ -1152,7 +1152,7 @@
}
GrBackendTexture GrD3DGpu::onCreateCompressedBackendTexture(
- SkISize dimensions, const GrBackendFormat& format, GrMipMapped mipMapped,
+ SkISize dimensions, const GrBackendFormat& format, GrMipmapped mipMapped,
GrProtected isProtected) {
return this->onCreateBackendTexture(dimensions, format, GrRenderable::kNo, mipMapped,
isProtected);
@@ -1200,7 +1200,7 @@
GrD3DTextureResourceInfo info;
if (!this->createTextureResourceForBackendSurface(dxgiFormat, { w, h }, GrTexturable::kNo,
- GrRenderable::kYes, GrMipMapped::kNo,
+ GrRenderable::kYes, GrMipmapped::kNo,
&info, GrProtected::kNo)) {
return {};
}
diff --git a/src/gpu/d3d/GrD3DGpu.h b/src/gpu/d3d/GrD3DGpu.h
index c3c93b0..2cacbf1 100644
--- a/src/gpu/d3d/GrD3DGpu.h
+++ b/src/gpu/d3d/GrD3DGpu.h
@@ -135,7 +135,7 @@
sk_sp<GrTexture> onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat&,
SkBudgeted,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
const void* data, size_t dataSize) override;
@@ -201,7 +201,7 @@
GrBackendTexture onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat&,
GrRenderable,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
bool onUpdateBackendTexture(const GrBackendTexture&,
@@ -210,7 +210,7 @@
GrBackendTexture onCreateCompressedBackendTexture(SkISize dimensions,
const GrBackendFormat&,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
bool onUpdateCompressedBackendTexture(const GrBackendTexture&,
@@ -247,7 +247,7 @@
SkISize dimensions,
GrTexturable texturable,
GrRenderable renderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrD3DTextureResourceInfo* info,
GrProtected isProtected);
diff --git a/src/gpu/d3d/GrD3DRenderTarget.h b/src/gpu/d3d/GrD3DRenderTarget.h
index c83cf60..1a50947 100644
--- a/src/gpu/d3d/GrD3DRenderTarget.h
+++ b/src/gpu/d3d/GrD3DRenderTarget.h
@@ -83,7 +83,7 @@
}
const GrCaps& caps = *this->getGpu()->caps();
return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(),
- numColorSamples, GrMipMapped::kNo);
+ numColorSamples, GrMipmapped::kNo);
}
private:
diff --git a/src/gpu/dawn/GrDawnGpu.cpp b/src/gpu/dawn/GrDawnGpu.cpp
index 2b60613..b839281 100644
--- a/src/gpu/dawn/GrDawnGpu.cpp
+++ b/src/gpu/dawn/GrDawnGpu.cpp
@@ -211,7 +211,7 @@
}
sk_sp<GrTexture> GrDawnGpu::onCreateCompressedTexture(SkISize dimensions, const GrBackendFormat&,
- SkBudgeted, GrMipMapped, GrProtected,
+ SkBudgeted, GrMipmapped, GrProtected,
const void* data, size_t dataSize) {
SkASSERT(!"unimplemented");
return nullptr;
@@ -301,7 +301,7 @@
GrBackendTexture GrDawnGpu::onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat& backendFormat,
GrRenderable renderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected) {
wgpu::TextureFormat format;
if (!backendFormat.asDawnFormat(&format)) {
@@ -309,7 +309,7 @@
}
// FIXME: Dawn doesn't support mipmapped render targets (yet).
- if (mipMapped == GrMipMapped::kYes && GrRenderable::kYes == renderable) {
+ if (mipMapped == GrMipmapped::kYes && GrRenderable::kYes == renderable) {
return GrBackendTexture();
}
@@ -324,7 +324,7 @@
}
int numMipLevels = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
numMipLevels = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height()) + 1;
}
@@ -404,7 +404,7 @@
}
GrBackendTexture GrDawnGpu::onCreateCompressedBackendTexture(
- SkISize dimensions, const GrBackendFormat&, GrMipMapped, GrProtected) {
+ SkISize dimensions, const GrBackendFormat&, GrMipmapped, GrProtected) {
return {};
}
diff --git a/src/gpu/dawn/GrDawnGpu.h b/src/gpu/dawn/GrDawnGpu.h
index 3805561..47a2b38 100644
--- a/src/gpu/dawn/GrDawnGpu.h
+++ b/src/gpu/dawn/GrDawnGpu.h
@@ -121,7 +121,7 @@
sk_sp<GrTexture> onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat&,
SkBudgeted,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
const void* data, size_t dataSize) override;
@@ -144,7 +144,7 @@
GrBackendTexture onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat&,
GrRenderable,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
bool onUpdateBackendTexture(const GrBackendTexture&,
@@ -153,7 +153,7 @@
GrBackendTexture onCreateCompressedBackendTexture(SkISize dimensions,
const GrBackendFormat&,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
bool onUpdateCompressedBackendTexture(const GrBackendTexture&,
diff --git a/src/gpu/dawn/GrDawnRenderTarget.cpp b/src/gpu/dawn/GrDawnRenderTarget.cpp
index 341c9e5..7343487 100644
--- a/src/gpu/dawn/GrDawnRenderTarget.cpp
+++ b/src/gpu/dawn/GrDawnRenderTarget.cpp
@@ -33,7 +33,7 @@
int numSamples = this->numSamples() + 1;
const GrCaps& caps = *getGpu()->caps();
return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(), numSamples,
- GrMipMapped::kNo);
+ GrMipmapped::kNo);
}
bool GrDawnRenderTarget::completeStencilAttachment() {
diff --git a/src/gpu/effects/GrCircleBlurFragmentProcessor.fp b/src/gpu/effects/GrCircleBlurFragmentProcessor.fp
index 129cdfa..7f1dba9 100644
--- a/src/gpu/effects/GrCircleBlurFragmentProcessor.fp
+++ b/src/gpu/effects/GrCircleBlurFragmentProcessor.fp
@@ -269,7 +269,7 @@
bm.setImmutable();
GrBitmapTextureMaker maker(context, bm, GrImageTexGenPolicy::kNew_Uncached_Budgeted);
- auto profileView = maker.view(GrMipMapped::kNo);
+ auto profileView = maker.view(GrMipmapped::kNo);
if (!profileView) {
return nullptr;
}
diff --git a/src/gpu/effects/GrConfigConversionEffect.fp b/src/gpu/effects/GrConfigConversionEffect.fp
index 29a6020..0e8624a 100644
--- a/src/gpu/effects/GrConfigConversionEffect.fp
+++ b/src/gpu/effects/GrConfigConversionEffect.fp
@@ -65,7 +65,7 @@
bitmap.setImmutable();
GrBitmapTextureMaker maker(context, bitmap, GrImageTexGenPolicy::kNew_Uncached_Budgeted);
- auto dataView = maker.view(GrMipMapped::kNo);
+ auto dataView = maker.view(GrMipmapped::kNo);
if (!dataView) {
return false;
}
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index a2fb462..5b86e16 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -125,7 +125,7 @@
}
bm.setImmutable();
GrBitmapTextureMaker maker(context, bm, GrImageTexGenPolicy::kNew_Uncached_Budgeted);
- view = maker.view(GrMipMapped::kNo);
+ view = maker.view(GrMipmapped::kNo);
if (!view) {
return {};
}
diff --git a/src/gpu/effects/GrRRectBlurEffect.fp b/src/gpu/effects/GrRRectBlurEffect.fp
index 0fa7477..40c8d9a 100644
--- a/src/gpu/effects/GrRRectBlurEffect.fp
+++ b/src/gpu/effects/GrRRectBlurEffect.fp
@@ -65,7 +65,7 @@
auto rtc = GrRenderTargetContext::MakeWithFallback(
context, GrColorType::kAlpha_8, nullptr, SkBackingFit::kExact, dimensions, 1,
- GrMipMapped::kNo, GrProtected::kNo, kMaskOrigin);
+ GrMipmapped::kNo, GrProtected::kNo, kMaskOrigin);
if (!rtc) {
return nullptr;
}
diff --git a/src/gpu/effects/GrRectBlurEffect.fp b/src/gpu/effects/GrRectBlurEffect.fp
index 48aa79e..215c3a7 100644
--- a/src/gpu/effects/GrRectBlurEffect.fp
+++ b/src/gpu/effects/GrRectBlurEffect.fp
@@ -94,7 +94,7 @@
bitmap.setImmutable();
GrBitmapTextureMaker maker(context, bitmap, GrImageTexGenPolicy::kNew_Uncached_Budgeted);
- auto view = maker.view(GrMipMapped::kNo);
+ auto view = maker.view(GrMipmapped::kNo);
if (!view) {
return {};
}
diff --git a/src/gpu/effects/GrTextureEffect.cpp b/src/gpu/effects/GrTextureEffect.cpp
index d28ea77..b667c3a 100644
--- a/src/gpu/effects/GrTextureEffect.cpp
+++ b/src/gpu/effects/GrTextureEffect.cpp
@@ -800,7 +800,7 @@
GrTest::TestWrapModes(testData->fRandom, wrapModes);
Filter filter;
- if (view.asTextureProxy()->mipMapped() == GrMipMapped::kYes) {
+ if (view.asTextureProxy()->mipMapped() == GrMipmapped::kYes) {
switch (testData->fRandom->nextULessThan(3)) {
case 0:
filter = Filter::kNearest;
diff --git a/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp b/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp
index 9d26ee5..cb1694a 100644
--- a/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp
@@ -250,7 +250,7 @@
bm.setImmutable();
GrBitmapTextureMaker maker(context, bm, GrImageTexGenPolicy::kNew_Uncached_Budgeted);
- auto profileView = maker.view(GrMipMapped::kNo);
+ auto profileView = maker.view(GrMipmapped::kNo);
if (!profileView) {
return nullptr;
}
diff --git a/src/gpu/effects/generated/GrConfigConversionEffect.cpp b/src/gpu/effects/generated/GrConfigConversionEffect.cpp
index 7018bb7..2297f7e 100644
--- a/src/gpu/effects/generated/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/generated/GrConfigConversionEffect.cpp
@@ -125,7 +125,7 @@
bitmap.setImmutable();
GrBitmapTextureMaker maker(context, bitmap, GrImageTexGenPolicy::kNew_Uncached_Budgeted);
- auto dataView = maker.view(GrMipMapped::kNo);
+ auto dataView = maker.view(GrMipmapped::kNo);
if (!dataView) {
return false;
}
diff --git a/src/gpu/effects/generated/GrRRectBlurEffect.h b/src/gpu/effects/generated/GrRRectBlurEffect.h
index 539bf46..c75a5c5 100644
--- a/src/gpu/effects/generated/GrRRectBlurEffect.h
+++ b/src/gpu/effects/generated/GrRRectBlurEffect.h
@@ -67,7 +67,7 @@
auto rtc = GrRenderTargetContext::MakeWithFallback(
context, GrColorType::kAlpha_8, nullptr, SkBackingFit::kExact, dimensions, 1,
- GrMipMapped::kNo, GrProtected::kNo, kMaskOrigin);
+ GrMipmapped::kNo, GrProtected::kNo, kMaskOrigin);
if (!rtc) {
return nullptr;
}
diff --git a/src/gpu/effects/generated/GrRectBlurEffect.h b/src/gpu/effects/generated/GrRectBlurEffect.h
index 126f7b2..da5382e 100644
--- a/src/gpu/effects/generated/GrRectBlurEffect.h
+++ b/src/gpu/effects/generated/GrRectBlurEffect.h
@@ -73,7 +73,7 @@
bitmap.setImmutable();
GrBitmapTextureMaker maker(context, bitmap, GrImageTexGenPolicy::kNew_Uncached_Budgeted);
- auto view = maker.view(GrMipMapped::kNo);
+ auto view = maker.view(GrMipmapped::kNo);
if (!view) {
return {};
}
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 88658f9..8a9d74a 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -1043,7 +1043,7 @@
bool GrGLGpu::uploadCompressedTexData(SkImage::CompressionType compressionType,
GrGLFormat format,
SkISize dimensions,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrGLenum target,
const void* data, size_t dataSize) {
SkASSERT(format != GrGLFormat::kUnknown);
@@ -1060,7 +1060,7 @@
bool useTexStorage = caps.formatSupportsTexStorage(format);
int numMipLevels = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
numMipLevels = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height())+1;
}
@@ -1364,7 +1364,7 @@
sk_sp<GrTexture> GrGLGpu::onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat& format,
SkBudgeted budgeted,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
const void* data, size_t dataSize) {
// We don't support protected textures in GL.
@@ -1396,7 +1396,7 @@
// Unbind this texture from the scratch texture unit.
this->bindTextureToScratchUnit(GR_GL_TEXTURE_2D, 0);
- GrMipMapsStatus mipMapsStatus = mipMapped == GrMipMapped::kYes
+ GrMipMapsStatus mipMapsStatus = mipMapped == GrMipmapped::kYes
? GrMipMapsStatus::kValid
: GrMipMapsStatus::kNotAllocated;
@@ -1408,7 +1408,7 @@
}
GrBackendTexture GrGLGpu::onCreateCompressedBackendTexture(
- SkISize dimensions, const GrBackendFormat& format, GrMipMapped mipMapped,
+ SkISize dimensions, const GrBackendFormat& format, GrMipmapped mipMapped,
GrProtected isProtected) {
// We don't support protected textures in GL.
if (isProtected == GrProtected::kYes) {
@@ -1462,7 +1462,7 @@
}
SkImage::CompressionType compression = GrBackendFormatToCompressionType(format);
- GrMipMapped mipMapped = backendTexture.hasMipMaps() ? GrMipMapped::kYes : GrMipMapped::kNo;
+ GrMipmapped mipMapped = backendTexture.hasMipMaps() ? GrMipmapped::kYes : GrMipmapped::kNo;
const char* rawData = nullptr;
size_t rawDataSize = 0;
@@ -1602,7 +1602,7 @@
SkISize dimensions,
SkImage::CompressionType compression,
GrGLFormat format,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrGLTextureParameters::SamplerOverriddenState* initialState) {
if (format == GrGLFormat::kUnknown) {
return 0;
@@ -2576,7 +2576,7 @@
if (samplerState.filter() == GrSamplerState::Filter::kMipMap) {
if (!this->caps()->mipMapSupport() ||
- texture->texturePriv().mipMapped() == GrMipMapped::kNo) {
+ texture->texturePriv().mipMapped() == GrMipmapped::kNo) {
samplerState.setFilterMode(GrSamplerState::Filter::kLinear);
}
}
@@ -3552,7 +3552,7 @@
GrBackendTexture GrGLGpu::onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat& format,
GrRenderable renderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected) {
// We don't support protected textures in GL.
if (isProtected == GrProtected::kYes) {
@@ -3567,7 +3567,7 @@
}
int numMipLevels = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
numMipLevels = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height()) + 1;
}
@@ -3588,7 +3588,7 @@
info.fTarget = GR_GL_TEXTURE_2D;
break;
case GrTextureType::kRectangle:
- if (!this->glCaps().rectangleTextureSupport() || mipMapped == GrMipMapped::kYes) {
+ if (!this->glCaps().rectangleTextureSupport() || mipMapped == GrMipmapped::kYes) {
return {};
}
info.fTarget = GR_GL_TEXTURE_RECTANGLE;
diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
index 3c2e748..4cc8926 100644
--- a/src/gpu/gl/GrGLGpu.h
+++ b/src/gpu/gl/GrGLGpu.h
@@ -195,12 +195,12 @@
GrBackendTexture onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat&,
GrRenderable,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
GrBackendTexture onCreateCompressedBackendTexture(SkISize dimensions,
const GrBackendFormat&,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
bool onUpdateBackendTexture(const GrBackendTexture&,
@@ -230,7 +230,7 @@
sk_sp<GrTexture> onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat&,
SkBudgeted,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
const void* data, size_t dataSize) override;
@@ -272,7 +272,7 @@
GrGLuint createCompressedTexture2D(SkISize dimensions,
SkImage::CompressionType compression,
GrGLFormat,
- GrMipMapped,
+ GrMipmapped,
GrGLTextureParameters::SamplerOverriddenState*);
bool onReadPixels(GrSurface*, int left, int top, int width, int height,
@@ -455,7 +455,7 @@
bool uploadCompressedTexData(SkImage::CompressionType compressionType,
GrGLFormat,
SkISize dimensions,
- GrMipMapped,
+ GrMipmapped,
GrGLenum target,
const void* data, size_t dataSize);
diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp
index 5a82c9e..7485874 100644
--- a/src/gpu/gl/GrGLRenderTarget.cpp
+++ b/src/gpu/gl/GrGLRenderTarget.cpp
@@ -102,7 +102,7 @@
size_t GrGLRenderTarget::onGpuMemorySize() const {
const GrCaps& caps = *this->getGpu()->caps();
return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(),
- fNumSamplesOwnedPerPixel, GrMipMapped::kNo);
+ fNumSamplesOwnedPerPixel, GrMipmapped::kNo);
}
bool GrGLRenderTarget::completeStencilAttachment() {
@@ -220,7 +220,7 @@
if (fMSColorRenderbufferID) {
const GrCaps& caps = *this->getGpu()->caps();
size_t size = GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(),
- this->msaaSamples(), GrMipMapped::kNo);
+ this->msaaSamples(), GrMipmapped::kNo);
// Due to this resource having both a texture and a renderbuffer component, dump as
// skia/gpu_resources/resource_#/renderbuffer
diff --git a/src/gpu/mock/GrMockGpu.cpp b/src/gpu/mock/GrMockGpu.cpp
index ecbde5a..ecf542d 100644
--- a/src/gpu/mock/GrMockGpu.cpp
+++ b/src/gpu/mock/GrMockGpu.cpp
@@ -167,7 +167,7 @@
sk_sp<GrTexture> GrMockGpu::onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat& format,
SkBudgeted budgeted,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
const void* data, size_t dataSize) {
if (fMockOptions.fFailTextureAllocations) {
@@ -180,7 +180,7 @@
SkASSERT(compression != SkImage::CompressionType::kNone);
#endif
- GrMipMapsStatus mipMapsStatus = (mipMapped == GrMipMapped::kYes)
+ GrMipMapsStatus mipMapsStatus = (mipMapped == GrMipmapped::kYes)
? GrMipMapsStatus::kValid
: GrMipMapsStatus::kNotAllocated;
GrMockTextureInfo texInfo(GrColorType::kUnknown,
@@ -276,7 +276,7 @@
GrBackendTexture GrMockGpu::onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat& format,
GrRenderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected) {
SkImage::CompressionType compression = format.asMockCompressionType();
if (compression != SkImage::CompressionType::kNone) {
@@ -295,7 +295,7 @@
}
GrBackendTexture GrMockGpu::onCreateCompressedBackendTexture(
- SkISize dimensions, const GrBackendFormat& format, GrMipMapped mipMapped,
+ SkISize dimensions, const GrBackendFormat& format, GrMipmapped mipMapped,
GrProtected) {
SkImage::CompressionType compression = format.asMockCompressionType();
if (compression == SkImage::CompressionType::kNone) {
diff --git a/src/gpu/mock/GrMockGpu.h b/src/gpu/mock/GrMockGpu.h
index a7e76c5..5f2158b 100644
--- a/src/gpu/mock/GrMockGpu.h
+++ b/src/gpu/mock/GrMockGpu.h
@@ -77,7 +77,7 @@
sk_sp<GrTexture> onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat&,
SkBudgeted,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
const void* data, size_t dataSize) override;
@@ -149,7 +149,7 @@
GrBackendTexture onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat&,
GrRenderable,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
bool onUpdateBackendTexture(const GrBackendTexture&,
@@ -160,7 +160,7 @@
GrBackendTexture onCreateCompressedBackendTexture(SkISize dimensions,
const GrBackendFormat&,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
bool onUpdateCompressedBackendTexture(const GrBackendTexture&,
diff --git a/src/gpu/mock/GrMockTexture.h b/src/gpu/mock/GrMockTexture.h
index 7ac6b54..2e883d3 100644
--- a/src/gpu/mock/GrMockTexture.h
+++ b/src/gpu/mock/GrMockTexture.h
@@ -114,7 +114,7 @@
}
const GrCaps& caps = *this->getGpu()->caps();
return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(),
- numColorSamples, GrMipMapped::kNo);
+ numColorSamples, GrMipmapped::kNo);
}
GrBackendRenderTarget getBackendRenderTarget() const override {
diff --git a/src/gpu/mtl/GrMtlGpu.h b/src/gpu/mtl/GrMtlGpu.h
index 5b9af89..5299ecb 100644
--- a/src/gpu/mtl/GrMtlGpu.h
+++ b/src/gpu/mtl/GrMtlGpu.h
@@ -134,7 +134,7 @@
GrBackendTexture onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat&,
GrRenderable,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
bool onUpdateBackendTexture(const GrBackendTexture&,
@@ -143,7 +143,7 @@
GrBackendTexture onCreateCompressedBackendTexture(SkISize dimensions,
const GrBackendFormat&,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
bool onUpdateCompressedBackendTexture(const GrBackendTexture&,
@@ -161,7 +161,7 @@
sk_sp<GrTexture> onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat&,
SkBudgeted,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
const void* data, size_t dataSize) override;
@@ -230,7 +230,7 @@
SkISize dimensions,
GrTexturable,
GrRenderable,
- GrMipMapped,
+ GrMipmapped,
GrMtlTextureInfo*);
#if GR_TEST_UTILS
diff --git a/src/gpu/mtl/GrMtlGpu.mm b/src/gpu/mtl/GrMtlGpu.mm
index 9928136..2582ce4 100644
--- a/src/gpu/mtl/GrMtlGpu.mm
+++ b/src/gpu/mtl/GrMtlGpu.mm
@@ -491,7 +491,7 @@
sk_sp<GrTexture> GrMtlGpu::onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat& format,
SkBudgeted budgeted,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
const void* data, size_t dataSize) {
// We don't support protected textures in Metal.
@@ -510,7 +510,7 @@
SkASSERT(this->caps()->isFormatCompressed(format));
int numMipLevels = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
numMipLevels = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height()) + 1;
}
@@ -534,7 +534,7 @@
texDesc.usage = MTLTextureUsageShaderRead;
}
- GrMipMapsStatus mipMapsStatus = (mipMapped == GrMipMapped::kYes)
+ GrMipMapsStatus mipMapsStatus = (mipMapped == GrMipmapped::kYes)
? GrMipMapsStatus::kValid
: GrMipMapsStatus::kNotAllocated;
@@ -553,7 +553,7 @@
SkTArray<size_t> individualMipOffsets(numMipLevels);
SkDEBUGCODE(size_t combinedBufferSize =) SkCompressedDataSize(compressionType, dimensions,
&individualMipOffsets,
- mipMapped == GrMipMapped::kYes);
+ mipMapped == GrMipmapped::kYes);
SkASSERT(individualMipOffsets.count() == numMipLevels);
SkASSERT(dataSize == combinedBufferSize);
@@ -776,7 +776,7 @@
SkISize dimensions,
GrTexturable texturable,
GrRenderable renderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrMtlTextureInfo* info) {
SkASSERT(texturable == GrTexturable::kYes || renderable == GrRenderable::kYes);
@@ -795,7 +795,7 @@
[MTLTextureDescriptor texture2DDescriptorWithPixelFormat: mtlFormat
width: dimensions.width()
height: dimensions.height()
- mipmapped: mipMapped == GrMipMapped::kYes];
+ mipmapped: mipMapped == GrMipmapped::kYes];
if (@available(macOS 10.11, iOS 9.0, *)) {
desc.storageMode = MTLStorageModePrivate;
desc.usage = texturable == GrTexturable::kYes ? MTLTextureUsageShaderRead : 0;
@@ -809,7 +809,7 @@
GrBackendTexture GrMtlGpu::onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat& format,
GrRenderable renderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected) {
const MTLPixelFormat mtlFormat = GrBackendFormatAsMTLPixelFormat(format);
@@ -844,7 +844,7 @@
}
int numMipLevels = mtlTexture.mipmapLevelCount;
- GrMipMapped mipMapped = numMipLevels > 1 ? GrMipMapped::kYes : GrMipMapped::kNo;
+ GrMipmapped mipMapped = numMipLevels > 1 ? GrMipmapped::kYes : GrMipmapped::kNo;
SkImage::CompressionType compression = GrBackendFormatToCompressionType(
backendTexture.getBackendFormat());
@@ -868,7 +868,7 @@
} else {
transferBufferSize = SkCompressedDataSize(compression, backendTexture.dimensions(),
&individualMipOffsets,
- mipMapped == GrMipMapped::kYes);
+ mipMapped == GrMipmapped::kYes);
}
SkASSERT(individualMipOffsets.count() == numMipLevels);
@@ -913,7 +913,7 @@
} else {
transferBufferSize = SkCompressedDataSize(compression, backendTexture.dimensions(),
&individualMipOffsets,
- mipMapped == GrMipMapped::kYes);
+ mipMapped == GrMipmapped::kYes);
SkASSERT(individualMipOffsets.count() == numMipLevels);
transferBuffer = [fDevice newBufferWithLength: transferBufferSize
@@ -977,7 +977,7 @@
}
GrBackendTexture GrMtlGpu::onCreateCompressedBackendTexture(
- SkISize dimensions, const GrBackendFormat& format, GrMipMapped mipMapped,
+ SkISize dimensions, const GrBackendFormat& format, GrMipmapped mipMapped,
GrProtected isProtected) {
const MTLPixelFormat mtlFormat = GrBackendFormatAsMTLPixelFormat(format);
@@ -1037,7 +1037,7 @@
GrMtlTextureInfo info;
if (!this->createMtlTextureForBackendSurface(format, {w, h}, GrTexturable::kNo,
GrRenderable::kYes,
- GrMipMapped::kNo, &info)) {
+ GrMipmapped::kNo, &info)) {
return {};
}
diff --git a/src/gpu/mtl/GrMtlRenderTarget.h b/src/gpu/mtl/GrMtlRenderTarget.h
index cae6a9d..f6b5124 100644
--- a/src/gpu/mtl/GrMtlRenderTarget.h
+++ b/src/gpu/mtl/GrMtlRenderTarget.h
@@ -62,7 +62,7 @@
}
const GrCaps& caps = *this->getGpu()->caps();
return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(),
- numColorSamples, GrMipMapped::kNo);
+ numColorSamples, GrMipmapped::kNo);
}
id<MTLTexture> fColorTexture;
diff --git a/src/gpu/mtl/GrMtlTexture.mm b/src/gpu/mtl/GrMtlTexture.mm
index fc98ad8..9e096fa 100644
--- a/src/gpu/mtl/GrMtlTexture.mm
+++ b/src/gpu/mtl/GrMtlTexture.mm
@@ -109,8 +109,8 @@
}
GrBackendTexture GrMtlTexture::getBackendTexture() const {
- GrMipMapped mipMapped = fTexture.mipmapLevelCount > 1 ? GrMipMapped::kYes
- : GrMipMapped::kNo;
+ GrMipmapped mipMapped = fTexture.mipmapLevelCount > 1 ? GrMipmapped::kYes
+ : GrMipmapped::kNo;
GrMtlTextureInfo info;
info.fTexture.reset(GrRetainPtrFromId(fTexture));
return GrBackendTexture(this->width(), this->height(), mipMapped, info);
diff --git a/src/gpu/mtl/GrMtlTextureRenderTarget.h b/src/gpu/mtl/GrMtlTextureRenderTarget.h
index bb10e5b..ae6b494 100644
--- a/src/gpu/mtl/GrMtlTextureRenderTarget.h
+++ b/src/gpu/mtl/GrMtlTextureRenderTarget.h
@@ -79,7 +79,7 @@
}
const GrCaps& caps = *this->getGpu()->caps();
return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(),
- numColorSamples, GrMipMapped::kNo);
+ numColorSamples, GrMipmapped::kNo);
}
};
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index bfb2e42..14b2dc8d 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -166,7 +166,7 @@
void visitProxies(const VisitProxyFunc& func) const override {
bool mipped = (GrSamplerState::Filter::kMipMap == fFilter);
- func(fView.proxy(), GrMipMapped(mipped));
+ func(fView.proxy(), GrMipmapped(mipped));
if (fProgramInfo) {
fProgramInfo->visitFPProxies(func);
} else {
@@ -442,7 +442,7 @@
dims,
GrRenderable::kNo,
1,
- GrMipMapped::kNo,
+ GrMipmapped::kNo,
SkBackingFit::kExact,
SkBudgeted::kYes,
GrProtected::kNo);
diff --git a/src/gpu/ops/GrOp.h b/src/gpu/ops/GrOp.h
index f642a41..83bf527 100644
--- a/src/gpu/ops/GrOp.h
+++ b/src/gpu/ops/GrOp.h
@@ -70,7 +70,7 @@
virtual const char* name() const = 0;
- using VisitProxyFunc = std::function<void(GrSurfaceProxy*, GrMipMapped)>;
+ using VisitProxyFunc = std::function<void(GrSurfaceProxy*, GrMipmapped)>;
virtual void visitProxies(const VisitProxyFunc&) const {
// This default implementation assumes the op has no proxies
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index d82945a..cbdbe11 100644
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -638,7 +638,7 @@
}
void visitProxies(const VisitProxyFunc& func) const override {
- func(fFalloffView.proxy(), GrMipMapped(false));
+ func(fFalloffView.proxy(), GrMipmapped(false));
if (fProgramInfo) {
fProgramInfo->visitFPProxies(func);
}
@@ -690,7 +690,7 @@
bitmap.setImmutable();
GrBitmapTextureMaker maker(context, bitmap, GrImageTexGenPolicy::kNew_Uncached_Budgeted);
- auto view = maker.view(GrMipMapped::kNo);
+ auto view = maker.view(GrMipmapped::kNo);
SkASSERT(view.origin() == kTopLeft_GrSurfaceOrigin);
if (view) {
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 3d182f8..9535855 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -277,7 +277,7 @@
const GrSurfaceProxyView* views = fAtlas->getViews();
for (uint32_t i = 0; i < fAtlas->numActivePages(); ++i) {
SkASSERT(views[i].proxy());
- func(views[i].proxy(), GrMipMapped::kNo);
+ func(views[i].proxy(), GrMipmapped::kNo);
}
}
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 7009443..9ec2f26 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -264,7 +264,7 @@
void visitProxies(const VisitProxyFunc& func) const override {
bool mipped = (GrSamplerState::Filter::kMipMap == fMetadata.filter());
for (unsigned p = 0; p < fMetadata.fProxyCount; ++p) {
- func(fViewCountPairs[p].fProxy.get(), GrMipMapped(mipped));
+ func(fViewCountPairs[p].fProxy.get(), GrMipmapped(mipped));
}
if (fDesc && fDesc->fProgramInfo) {
fDesc->fProgramInfo->visitFPProxies(func);
@@ -1270,9 +1270,9 @@
dims.fHeight = random->nextULessThan(90) + 10;
dims.fWidth = random->nextULessThan(90) + 10;
auto origin = random->nextBool() ? kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin;
- GrMipMapped mipMapped = random->nextBool() ? GrMipMapped::kYes : GrMipMapped::kNo;
+ GrMipmapped mipMapped = random->nextBool() ? GrMipmapped::kYes : GrMipmapped::kNo;
SkBackingFit fit = SkBackingFit::kExact;
- if (mipMapped == GrMipMapped::kNo) {
+ if (mipMapped == GrMipmapped::kNo) {
fit = random->nextBool() ? SkBackingFit::kApprox : SkBackingFit::kExact;
}
const GrBackendFormat format =
@@ -1293,7 +1293,7 @@
SkPMColor4f color = SkPMColor4f::FromBytes_RGBA(SkColorToPremulGrColor(random->nextU()));
GrSamplerState::Filter filter = (GrSamplerState::Filter)random->nextULessThan(
static_cast<uint32_t>(GrSamplerState::Filter::kMipMap) + 1);
- while (mipMapped == GrMipMapped::kNo && filter == GrSamplerState::Filter::kMipMap) {
+ while (mipMapped == GrMipmapped::kNo && filter == GrSamplerState::Filter::kMipMap) {
filter = (GrSamplerState::Filter)random->nextULessThan(
static_cast<uint32_t>(GrSamplerState::Filter::kMipMap) + 1);
}
diff --git a/src/gpu/tessellate/GrDrawAtlasPathOp.h b/src/gpu/tessellate/GrDrawAtlasPathOp.h
index 43f8671..c7299a7 100644
--- a/src/gpu/tessellate/GrDrawAtlasPathOp.h
+++ b/src/gpu/tessellate/GrDrawAtlasPathOp.h
@@ -32,7 +32,7 @@
return (fEnableHWAA) ? FixedFunctionFlags::kUsesHWAA : FixedFunctionFlags::kNone;
}
void visitProxies(const VisitProxyFunc& fn) const override {
- fn(fAtlasProxy.get(), GrMipMapped::kNo);
+ fn(fAtlasProxy.get(), GrMipmapped::kNo);
fProcessors.visitProxies(fn);
}
GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index f64f051..be84fcf 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -720,9 +720,9 @@
SkTArray<size_t>* individualMipOffsets,
GrStagingBufferManager::Slice* slice,
SkImage::CompressionType compression,
- VkFormat vkFormat, SkISize dimensions, GrMipMapped mipMapped) {
+ VkFormat vkFormat, SkISize dimensions, GrMipmapped mipMapped) {
int numMipLevels = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
numMipLevels = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height()) + 1;
}
@@ -738,7 +738,7 @@
numMipLevels);
} else {
combinedBufferSize = SkCompressedDataSize(compression, dimensions, individualMipOffsets,
- mipMapped == GrMipMapped::kYes);
+ mipMapped == GrMipmapped::kYes);
}
SkASSERT(individualMipOffsets->count() == numMipLevels);
@@ -962,7 +962,7 @@
// but for now it's easier to maintain as a separate entity.
bool GrVkGpu::uploadTexDataCompressed(GrVkTexture* uploadTexture,
SkImage::CompressionType compression, VkFormat vkFormat,
- SkISize dimensions, GrMipMapped mipMapped,
+ SkISize dimensions, GrMipmapped mipMapped,
const void* data, size_t dataSize) {
if (!this->currentCommandBuffer()) {
return false;
@@ -1018,7 +1018,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-// TODO: make this take a GrMipMapped
+// TODO: make this take a GrMipmapped
sk_sp<GrTexture> GrVkGpu::onCreateTexture(SkISize dimensions,
const GrBackendFormat& format,
GrRenderable renderable,
@@ -1110,7 +1110,7 @@
sk_sp<GrTexture> GrVkGpu::onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat& format,
SkBudgeted budgeted,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected,
const void* data, size_t dataSize) {
VkFormat pixelFormat;
@@ -1128,7 +1128,7 @@
usageFlags |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
int numMipLevels = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
numMipLevels = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height())+1;
}
@@ -1144,7 +1144,7 @@
imageDesc.fUsageFlags = usageFlags;
imageDesc.fIsProtected = isProtected;
- GrMipMapsStatus mipMapsStatus = (mipMapped == GrMipMapped::kYes)
+ GrMipMapsStatus mipMapsStatus = (mipMapped == GrMipmapped::kYes)
? GrMipMapsStatus::kValid
: GrMipMapsStatus::kNotAllocated;
@@ -1554,7 +1554,7 @@
bool generate_compressed_data(GrVkGpu* gpu, char* mapPtr,
SkImage::CompressionType compression, SkISize dimensions,
- GrMipMapped mipMapped, const SkColor4f& color) {
+ GrMipmapped mipMapped, const SkColor4f& color) {
SkASSERT(mapPtr);
GrFillInCompressedData(compression, dimensions, mipMapped, mapPtr, color);
@@ -1565,7 +1565,7 @@
SkISize dimensions,
GrTexturable texturable,
GrRenderable renderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrVkImageInfo* info,
GrProtected isProtected) {
SkASSERT(texturable == GrTexturable::kYes || renderable == GrRenderable::kYes);
@@ -1583,7 +1583,7 @@
}
int numMipLevels = 1;
- if (mipMapped == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kYes) {
numMipLevels = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height()) + 1;
}
@@ -1712,7 +1712,7 @@
GrBackendTexture GrVkGpu::onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat& format,
GrRenderable renderable,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected) {
this->handleDirtyContext();
@@ -1747,7 +1747,7 @@
}
GrBackendTexture GrVkGpu::onCreateCompressedBackendTexture(
- SkISize dimensions, const GrBackendFormat& format, GrMipMapped mipMapped,
+ SkISize dimensions, const GrBackendFormat& format, GrMipmapped mipMapped,
GrProtected isProtected) {
return this->onCreateBackendTexture(dimensions, format, GrRenderable::kNo, mipMapped,
isProtected);
@@ -1935,7 +1935,7 @@
GrVkImageInfo info;
if (!this->createVkImageForBackendSurface(vkFormat, {w, h}, GrTexturable::kNo,
- GrRenderable::kYes, GrMipMapped::kNo,
+ GrRenderable::kYes, GrMipmapped::kNo,
&info, GrProtected::kNo)) {
return {};
}
diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h
index 9d4fd6b..2e71638 100644
--- a/src/gpu/vk/GrVkGpu.h
+++ b/src/gpu/vk/GrVkGpu.h
@@ -194,11 +194,11 @@
GrBackendTexture onCreateBackendTexture(SkISize dimensions,
const GrBackendFormat&,
GrRenderable,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
GrBackendTexture onCreateCompressedBackendTexture(SkISize dimensions,
const GrBackendFormat&,
- GrMipMapped,
+ GrMipmapped,
GrProtected) override;
bool onUpdateBackendTexture(const GrBackendTexture&,
@@ -225,7 +225,7 @@
sk_sp<GrTexture> onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat&,
SkBudgeted,
- GrMipMapped,
+ GrMipmapped,
GrProtected,
const void* data, size_t dataSize) override;
@@ -307,7 +307,7 @@
bool uploadTexDataOptimal(GrVkTexture* tex, int left, int top, int width, int height,
GrColorType colorType, const GrMipLevel texels[], int mipLevelCount);
bool uploadTexDataCompressed(GrVkTexture* tex, SkImage::CompressionType compression,
- VkFormat vkFormat, SkISize dimensions, GrMipMapped mipMapped,
+ VkFormat vkFormat, SkISize dimensions, GrMipmapped mipMapped,
const void* data, size_t dataSize);
void resolveImage(GrSurface* dst, GrVkRenderTarget* src, const SkIRect& srcRect,
const SkIPoint& dstPoint);
@@ -316,7 +316,7 @@
SkISize dimensions,
GrTexturable,
GrRenderable,
- GrMipMapped,
+ GrMipmapped,
GrVkImageInfo*,
GrProtected);
diff --git a/src/gpu/vk/GrVkRenderTarget.h b/src/gpu/vk/GrVkRenderTarget.h
index 32149d1..1f7a513 100644
--- a/src/gpu/vk/GrVkRenderTarget.h
+++ b/src/gpu/vk/GrVkRenderTarget.h
@@ -145,7 +145,7 @@
}
const GrCaps& caps = *this->getGpu()->caps();
return GrSurface::ComputeSize(caps, this->backendFormat(), this->dimensions(),
- numColorSamples, GrMipMapped::kNo);
+ numColorSamples, GrMipmapped::kNo);
}
private:
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 2fd4542..d2da072 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -592,11 +592,11 @@
}
#ifndef SK_IMAGE_MAKE_TEXTURE_IMAGE_ALLOW_GR_CONTEXT
-sk_sp<SkImage> SkImage::makeTextureImage(GrDirectContext*, GrMipMapped, SkBudgeted) const {
+sk_sp<SkImage> SkImage::makeTextureImage(GrDirectContext*, GrMipmapped, SkBudgeted) const {
return nullptr;
}
#else
-sk_sp<SkImage> SkImage::makeTextureImage(GrContext*, GrMipMapped, SkBudgeted) const {
+sk_sp<SkImage> SkImage::makeTextureImage(GrContext*, GrMipmapped, SkBudgeted) const {
return nullptr;
}
#endif
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index 848e703..86161d3 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -92,7 +92,7 @@
// this call will flatten a SkImage_GpuYUV to a single texture.
virtual const GrSurfaceProxyView* view(GrRecordingContext*) const { return nullptr; }
- virtual GrSurfaceProxyView refView(GrRecordingContext*, GrMipMapped) const = 0;
+ virtual GrSurfaceProxyView refView(GrRecordingContext*, GrMipmapped) const = 0;
virtual GrSurfaceProxyView refPinnedView(GrRecordingContext*, uint32_t* uniqueID) const {
return {};
}
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 8b9fa44..1282819 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -279,7 +279,7 @@
sk_sp<SkImage> SkImage::MakeTextureFromCompressed(GrDirectContext* direct, sk_sp<SkData> data,
int width, int height, CompressionType type,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrProtected isProtected) {
if (!direct || !data) {
return nullptr;
@@ -349,7 +349,7 @@
sk_sp<SkColorSpace> imageColorSpace) {
auto renderTargetContext = GrRenderTargetContext::Make(
ctx, GrColorType::kRGBA_8888, std::move(imageColorSpace), SkBackingFit::kExact,
- imageSize, 1, GrMipMapped::kNo, GrProtected::kNo, imageOrigin);
+ imageSize, 1, GrMipmapped::kNo, GrProtected::kNo, imageOrigin);
if (!renderTargetContext) {
return nullptr;
}
@@ -466,7 +466,7 @@
}
static sk_sp<SkImage> create_image_from_producer(GrContext* context, GrTextureProducer* producer,
- uint32_t id, GrMipMapped mipMapped) {
+ uint32_t id, GrMipmapped mipMapped) {
auto view = producer->view(mipMapped);
if (!view) {
return nullptr;
@@ -478,11 +478,11 @@
#ifndef SK_IMAGE_MAKE_TEXTURE_IMAGE_ALLOW_GR_CONTEXT
sk_sp<SkImage> SkImage::makeTextureImage(GrDirectContext* direct,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkBudgeted budgeted) const {
#else
sk_sp<SkImage> SkImage::makeTextureImage(GrContext* context,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
SkBudgeted budgeted) const {
auto direct = GrAsDirectContext(context);
#endif
@@ -499,7 +499,7 @@
const GrSurfaceProxyView* view = as_IB(this)->view(direct);
SkASSERT(view && view->asTextureProxy());
- if (mipMapped == GrMipMapped::kNo || view->asTextureProxy()->mipMapped() == mipMapped ||
+ if (mipMapped == GrMipmapped::kNo || view->asTextureProxy()->mipMapped() == mipMapped ||
!direct->priv().caps()->mipMapSupport()) {
return sk_ref_sp(const_cast<SkImage*>(this));
}
@@ -531,7 +531,7 @@
const GrBackendFormat& backendFormat,
int width,
int height,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrSurfaceOrigin origin,
SkColorType colorType,
SkAlphaType alphaType,
@@ -627,7 +627,7 @@
SkBitmap bmp;
bmp.installPixels(*pixmap);
GrBitmapTextureMaker bitmapMaker(context, bmp, GrImageTexGenPolicy::kNew_Uncached_Budgeted);
- GrMipMapped mipMapped = buildMips ? GrMipMapped::kYes : GrMipMapped::kNo;
+ GrMipmapped mipMapped = buildMips ? GrMipmapped::kYes : GrMipmapped::kNo;
auto view = bitmapMaker.view(mipMapped);
if (!view) {
return SkImage::MakeRasterCopy(*pixmap);
diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h
index 1436ccc..a0de3d1 100644
--- a/src/image/SkImage_Gpu.h
+++ b/src/image/SkImage_Gpu.h
@@ -73,7 +73,7 @@
const GrBackendFormat& backendFormat,
int width,
int height,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrSurfaceOrigin origin,
SkColorType colorType,
SkAlphaType alphaType,
diff --git a/src/image/SkImage_GpuBase.cpp b/src/image/SkImage_GpuBase.cpp
index 771f53d..0361a7a 100644
--- a/src/image/SkImage_GpuBase.cpp
+++ b/src/image/SkImage_GpuBase.cpp
@@ -143,7 +143,7 @@
const GrSurfaceProxyView* view = this->view(direct);
SkASSERT(view && view->proxy());
- auto copyView = GrSurfaceProxyView::Copy(direct, *view, GrMipMapped::kNo, subset,
+ auto copyView = GrSurfaceProxyView::Copy(direct, *view, GrMipmapped::kNo, subset,
SkBackingFit::kExact, view->proxy()->isBudgeted());
if (!copyView) {
@@ -182,7 +182,7 @@
}
GrSurfaceProxyView SkImage_GpuBase::refView(GrRecordingContext* context,
- GrMipMapped mipMapped) const {
+ GrMipmapped mipMapped) const {
if (!context || !fContext->priv().matches(context)) {
SkASSERT(0);
return {};
@@ -332,7 +332,7 @@
sk_sp<GrTextureProxy> SkImage_GpuBase::MakePromiseImageLazyProxy(
GrRecordingContext* context, int width, int height,
- GrBackendFormat backendFormat, GrMipMapped mipMapped,
+ GrBackendFormat backendFormat, GrMipmapped mipMapped,
PromiseImageTextureFulfillProc fulfillProc, PromiseImageTextureReleaseProc releaseProc,
PromiseImageTextureDoneProc doneProc, PromiseImageTextureContext textureContext,
PromiseImageApiVersion version) {
@@ -345,7 +345,7 @@
return nullptr;
}
- if (mipMapped == GrMipMapped::kYes &&
+ if (mipMapped == GrMipmapped::kYes &&
GrTextureTypeHasRestrictedSampling(backendFormat.textureType())) {
// It is invalid to have a GL_TEXTURE_EXTERNAL or GL_TEXTURE_RECTANGLE and have mips as
// well.
@@ -494,7 +494,7 @@
// Ganesh assumes that, when wrapping a mipmapped backend texture from a client, that its
// mipmaps are fully fleshed out.
- GrMipMapsStatus mipMapsStatus = (GrMipMapped::kYes == mipMapped)
+ GrMipMapsStatus mipMapsStatus = (GrMipmapped::kYes == mipMapped)
? GrMipMapsStatus::kValid : GrMipMapsStatus::kNotAllocated;
// We pass kReadOnly here since we should treat content of the client's texture as immutable.
diff --git a/src/image/SkImage_GpuBase.h b/src/image/SkImage_GpuBase.h
index 9c4b7e1..9f06f55 100644
--- a/src/image/SkImage_GpuBase.h
+++ b/src/image/SkImage_GpuBase.h
@@ -30,7 +30,7 @@
bool onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB,
int srcX, int srcY, CachingHint) const override;
- GrSurfaceProxyView refView(GrRecordingContext*, GrMipMapped) const final;
+ GrSurfaceProxyView refView(GrRecordingContext*, GrMipmapped) const final;
GrSurfaceProxyView refPinnedView(GrRecordingContext* context, uint32_t* uniqueID) const final {
*uniqueID = this->uniqueID();
@@ -82,7 +82,7 @@
// proxy along with the TextureFulfillProc and TextureReleaseProc. PromiseDoneProc must not
// be null.
static sk_sp<GrTextureProxy> MakePromiseImageLazyProxy(
- GrRecordingContext*, int width, int height, GrBackendFormat, GrMipMapped,
+ GrRecordingContext*, int width, int height, GrBackendFormat, GrMipmapped,
PromiseImageTextureFulfillProc, PromiseImageTextureReleaseProc,
PromiseImageTextureDoneProc, PromiseImageTextureContext, PromiseImageApiVersion);
diff --git a/src/image/SkImage_GpuYUVA.cpp b/src/image/SkImage_GpuYUVA.cpp
index 0855a49..3410371 100644
--- a/src/image/SkImage_GpuYUVA.cpp
+++ b/src/image/SkImage_GpuYUVA.cpp
@@ -106,7 +106,7 @@
}
for (int i = 0; i < fNumViews; ++i) {
auto* t = fViews[i].asTextureProxy();
- if (t->mipMapped() == GrMipMapped::kNo && (t->width() > 1 || t->height() > 1)) {
+ if (t->mipMapped() == GrMipmapped::kNo && (t->width() > 1 || t->height() > 1)) {
if (!(newViews[i] = GrCopyBaseMipMapToView(context, fViews[i]))) {
return false;
}
@@ -160,7 +160,7 @@
// Needs to create a render target in order to draw to it for the yuv->rgb conversion.
auto renderTargetContext = GrRenderTargetContext::Make(
context, GrColorType::kRGBA_8888, this->refColorSpace(), SkBackingFit::kExact,
- this->dimensions(), 1, GrMipMapped::kNo, GrProtected::kNo, fOrigin);
+ this->dimensions(), 1, GrMipmapped::kNo, GrProtected::kNo, fOrigin);
if (!renderTargetContext) {
return;
}
@@ -187,7 +187,7 @@
GrSurfaceProxyView SkImage_GpuYUVA::refMippedView(GrRecordingContext* context) const {
// if invalid or already has miplevels
this->flattenToRGB(context);
- if (!fRGBView || fRGBView.asTextureProxy()->mipMapped() == GrMipMapped::kYes) {
+ if (!fRGBView || fRGBView.asTextureProxy()->mipMapped() == GrMipmapped::kYes) {
return fRGBView;
}
@@ -309,7 +309,7 @@
SkBitmap bmp;
bmp.installPixels(*pixmap);
GrBitmapTextureMaker bitmapMaker(context, bmp, GrImageTexGenPolicy::kNew_Uncached_Budgeted);
- GrMipMapped mipMapped = buildMips ? GrMipMapped::kYes : GrMipMapped::kNo;
+ GrMipmapped mipMapped = buildMips ? GrMipmapped::kYes : GrMipmapped::kNo;
GrSurfaceProxyView view;
tempViews[i] = bitmapMaker.view(mipMapped);
if (!tempViews[i]) {
@@ -391,7 +391,7 @@
for (int texIdx = 0; texIdx < numTextures; ++texIdx) {
auto proxy = MakePromiseImageLazyProxy(
context, yuvaSizes[texIdx].width(), yuvaSizes[texIdx].height(),
- yuvaFormats[texIdx], GrMipMapped::kNo, textureFulfillProc, textureReleaseProc,
+ yuvaFormats[texIdx], GrMipmapped::kNo, textureFulfillProc, textureReleaseProc,
promiseDoneProc, textureContexts[texIdx], version);
++proxiesCreated;
if (!proxy) {
diff --git a/src/image/SkImage_Lazy.cpp b/src/image/SkImage_Lazy.cpp
index 1ec5dec..9eb12ae 100644
--- a/src/image/SkImage_Lazy.cpp
+++ b/src/image/SkImage_Lazy.cpp
@@ -230,7 +230,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
#if SK_SUPPORT_GPU
-GrSurfaceProxyView SkImage_Lazy::refView(GrRecordingContext* context, GrMipMapped mipMapped) const {
+GrSurfaceProxyView SkImage_Lazy::refView(GrRecordingContext* context, GrMipmapped mipMapped) const {
if (!context) {
return {};
}
@@ -386,7 +386,7 @@
*/
GrSurfaceProxyView SkImage_Lazy::lockTextureProxyView(GrRecordingContext* ctx,
GrImageTexGenPolicy texGenPolicy,
- GrMipMapped mipMapped) const {
+ GrMipmapped mipMapped) const {
// Values representing the various texture lock paths we can take. Used for logging the path
// taken to a histogram.
enum LockTexturePath {
@@ -427,8 +427,8 @@
kLockTexturePathCount);
GrSwizzle swizzle = caps->getReadSwizzle(proxy->backendFormat(), ct);
GrSurfaceProxyView view(std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle);
- if (mipMapped == GrMipMapped::kNo ||
- view.asTextureProxy()->mipMapped() == GrMipMapped::kYes) {
+ if (mipMapped == GrMipmapped::kNo ||
+ view.asTextureProxy()->mipMapped() == GrMipmapped::kYes) {
return view;
} else {
// We need a mipped proxy, but we found a cached proxy that wasn't mipped. Thus we
@@ -462,7 +462,7 @@
// 3. Ask the generator to return YUV planes, which the GPU can convert. If we will be mipping
// the texture we skip this step so the CPU generate non-planar MIP maps for us.
- if (mipMapped == GrMipMapped::kNo && !ctx->priv().options().fDisableGpuYUVConversion) {
+ if (mipMapped == GrMipmapped::kNo && !ctx->priv().options().fDisableGpuYUVConversion) {
SkColorType colorType = this->colorType();
ScopedGenerator generator(fSharedGenerator);
diff --git a/src/image/SkImage_Lazy.h b/src/image/SkImage_Lazy.h
index 6fb030f..989db5c 100644
--- a/src/image/SkImage_Lazy.h
+++ b/src/image/SkImage_Lazy.h
@@ -43,7 +43,7 @@
bool onReadPixels(const SkImageInfo&, void*, size_t, int srcX, int srcY,
CachingHint) const override;
#if SK_SUPPORT_GPU
- GrSurfaceProxyView refView(GrRecordingContext*, GrMipMapped) const override;
+ GrSurfaceProxyView refView(GrRecordingContext*, GrMipmapped) const override;
sk_sp<SkCachedData> getPlanes(SkYUVASizeInfo*, SkYUVAIndex[4],
SkYUVColorSpace*, const void* planes[4]) override;
#endif
@@ -62,7 +62,7 @@
// cached in CPU memory. We will always cache the generated texture on success.
GrSurfaceProxyView lockTextureProxyView(GrRecordingContext*,
GrImageTexGenPolicy,
- GrMipMapped) const;
+ GrMipmapped) const;
// Returns the GrColorType to use with the GrTextureProxy returned from lockTextureProxy. This
// may be different from the color type on the image in the case where we need up upload CPU
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index 16f4217..8900e02 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -84,7 +84,7 @@
const SkBitmap* onPeekBitmap() const override { return &fBitmap; }
#if SK_SUPPORT_GPU
- GrSurfaceProxyView refView(GrRecordingContext*, GrMipMapped) const override;
+ GrSurfaceProxyView refView(GrRecordingContext*, GrMipmapped) const override;
#endif
bool getROPixels(SkBitmap*, CachingHint) const override;
@@ -185,7 +185,7 @@
#if SK_SUPPORT_GPU
GrSurfaceProxyView SkImage_Raster::refView(GrRecordingContext* context,
- GrMipMapped mipMapped) const {
+ GrMipmapped mipMapped) const {
if (!context) {
return {};
}
@@ -220,7 +220,7 @@
} else {
SkASSERT(fPinnedCount == 0);
SkASSERT(fPinnedUniqueID == 0);
- fPinnedView = GrRefCachedBitmapView(rContext, fBitmap, GrMipMapped::kNo);
+ fPinnedView = GrRefCachedBitmapView(rContext, fBitmap, GrMipmapped::kNo);
if (!fPinnedView) {
return false;
}
diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp
index 3b44c8a..a31a59e 100644
--- a/src/image/SkSurface_Gpu.cpp
+++ b/src/image/SkSurface_Gpu.cpp
@@ -215,7 +215,7 @@
size_t maxResourceBytes = direct->getResourceCacheLimit();
- bool mipmapped = rtc->asTextureProxy() ? GrMipMapped::kYes == rtc->asTextureProxy()->mipMapped()
+ bool mipmapped = rtc->asTextureProxy() ? GrMipmapped::kYes == rtc->asTextureProxy()->mipMapped()
: false;
SkColorType ct = GrColorTypeToSkColorType(rtc->colorInfo().colorType());
@@ -310,7 +310,7 @@
}
if (characterization.isMipMapped() &&
- GrMipMapped::kNo == rtc->asTextureProxy()->mipMapped()) {
+ GrMipmapped::kNo == rtc->asTextureProxy()->mipMapped()) {
// Fail if the DDL's surface was mipmapped but the replay surface is not.
// Allow drawing to proceed if the DDL was not mipmapped but the replay surface is.
return false;
@@ -385,7 +385,7 @@
auto rtc = GrRenderTargetContext::Make(
context, grColorType, c.refColorSpace(), SkBackingFit::kExact,
- {c.width(), c.height()}, c.sampleCount(), GrMipMapped(c.isMipMapped()), c.isProtected(),
+ {c.width(), c.height()}, c.sampleCount(), GrMipmapped(c.isMipMapped()), c.isProtected(),
c.origin(), budgeted, &c.surfaceProps());
if (!rtc) {
return nullptr;
@@ -498,10 +498,10 @@
return nullptr;
}
sampleCount = std::max(1, sampleCount);
- GrMipMapped mipMapped = shouldCreateWithMips ? GrMipMapped::kYes : GrMipMapped::kNo;
+ GrMipmapped mipMapped = shouldCreateWithMips ? GrMipmapped::kYes : GrMipmapped::kNo;
if (!ctx->priv().caps()->mipMapSupport()) {
- mipMapped = GrMipMapped::kNo;
+ mipMapped = GrMipmapped::kNo;
}
sk_sp<SkGpuDevice> device(SkGpuDevice::Make(
diff --git a/src/image/SkSurface_GpuMtl.mm b/src/image/SkSurface_GpuMtl.mm
index 2751167..b095f56 100644
--- a/src/image/SkSurface_GpuMtl.mm
+++ b/src/image/SkSurface_GpuMtl.mm
@@ -45,7 +45,7 @@
SkISize dims = {(int)metalLayer.drawableSize.width, (int)metalLayer.drawableSize.height};
GrProxyProvider::TextureInfo texInfo;
- texInfo.fMipMapped = GrMipMapped::kNo;
+ texInfo.fMipMapped = GrMipmapped::kNo;
texInfo.fTextureType = GrTextureType::k2D;
sk_sp<GrRenderTargetProxy> proxy = proxyProvider->createLazyRenderTargetProxy(
@@ -116,7 +116,7 @@
SkISize dims = {(int)mtkView.drawableSize.width, (int)mtkView.drawableSize.height};
GrProxyProvider::TextureInfo texInfo;
- texInfo.fMipMapped = GrMipMapped::kNo;
+ texInfo.fMipMapped = GrMipmapped::kNo;
texInfo.fTextureType = GrTextureType::k2D;
sk_sp<GrRenderTargetProxy> proxy = proxyProvider->createLazyRenderTargetProxy(