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/gm/bc1_transparency.cpp b/gm/bc1_transparency.cpp
index b49a83e..964122a 100644
--- a/gm/bc1_transparency.cpp
+++ b/gm/bc1_transparency.cpp
@@ -106,7 +106,7 @@
kImgWidth,
kImgHeight,
compression,
- GrMipMapped::kNo);
+ GrMipmapped::kNo);
} else {
return SkImage::MakeRasterFromCompressed(std::move(data),
kImgWidth,
diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp
index c032457..730cb35 100644
--- a/gm/clockwise.cpp
+++ b/gm/clockwise.cpp
@@ -249,7 +249,7 @@
GrColorType rtcColorType = rtc->colorInfo().colorType();
if (auto topLeftRTC = GrRenderTargetContext::Make(
ctx, rtcColorType, nullptr, SkBackingFit::kExact, {100, 200}, 1,
- GrMipMapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin, SkBudgeted::kYes,
+ GrMipmapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin, SkBudgeted::kYes,
nullptr)) {
topLeftRTC->clear(SK_PMColor4fTRANSPARENT);
topLeftRTC->priv().testingOnly_addDrawOp(ClockwiseTestOp::Make(ctx, false, 0));
@@ -264,7 +264,7 @@
// Draw the test to an off-screen, bottom-up render target.
if (auto topLeftRTC = GrRenderTargetContext::Make(
ctx, rtcColorType, nullptr, SkBackingFit::kExact, {100, 200}, 1,
- GrMipMapped::kNo, GrProtected::kNo, kBottomLeft_GrSurfaceOrigin, SkBudgeted::kYes,
+ GrMipmapped::kNo, GrProtected::kNo, kBottomLeft_GrSurfaceOrigin, SkBudgeted::kYes,
nullptr)) {
topLeftRTC->clear(SK_PMColor4fTRANSPARENT);
topLeftRTC->priv().testingOnly_addDrawOp(ClockwiseTestOp::Make(ctx, false, 0));
diff --git a/gm/compressed_textures.cpp b/gm/compressed_textures.cpp
index 7206d8b..e21d5b5 100644
--- a/gm/compressed_textures.cpp
+++ b/gm/compressed_textures.cpp
@@ -234,7 +234,7 @@
image = SkImage::MakeTextureFromCompressed(direct, std::move(data),
fImgDimensions.width(),
fImgDimensions.height(),
- compression, GrMipMapped::kYes);
+ compression, GrMipmapped::kYes);
} else {
image = SkImage::MakeRasterFromCompressed(std::move(data),
fImgDimensions.width(),
diff --git a/gm/exoticformats.cpp b/gm/exoticformats.cpp
index 5b5967b..4c7f131 100644
--- a/gm/exoticformats.cpp
+++ b/gm/exoticformats.cpp
@@ -22,7 +22,7 @@
//-------------------------------------------------------------------------------------------------
struct ImageInfo {
SkISize fDim;
- GrMipMapped fMipMapped;
+ GrMipmapped fMipMapped;
SkImage::CompressionType fCompressionType;
};
@@ -113,13 +113,13 @@
}
if (numberOfMipmapLevels == 1) {
- imageInfo->fMipMapped = GrMipMapped::kNo;
+ imageInfo->fMipMapped = GrMipmapped::kNo;
} else {
int numRequiredMipLevels = SkMipmap::ComputeLevelCount(pixelWidth, pixelHeight)+1;
if (numberOfMipmapLevels != numRequiredMipLevels) {
return nullptr;
}
- imageInfo->fMipMapped = GrMipMapped::kYes;
+ imageInfo->fMipMapped = GrMipmapped::kYes;
}
if (bytesOfKeyValueData != 0) {
@@ -131,7 +131,7 @@
size_t dataSize = SkCompressedDataSize(imageInfo->fCompressionType,
{ (int) pixelWidth, (int) pixelHeight },
&individualMipOffsets,
- imageInfo->fMipMapped == GrMipMapped::kYes);
+ imageInfo->fMipMapped == GrMipmapped::kYes);
SkASSERT(individualMipOffsets.size() == (size_t) numberOfMipmapLevels);
sk_sp<SkData> data = SkData::MakeUninitialized(dataSize);
@@ -254,17 +254,17 @@
int numberOfMipmapLevels = 1;
if (header.dwFlags & kDDSD_MIPMAPCOUNT) {
if (header.dwMipMapCount == 1) {
- imageInfo->fMipMapped = GrMipMapped::kNo;
+ imageInfo->fMipMapped = GrMipmapped::kNo;
} else {
int numRequiredLevels = SkMipmap::ComputeLevelCount(header.dwWidth, header.dwHeight)+1;
if (header.dwMipMapCount != (unsigned) numRequiredLevels) {
return nullptr;
}
- imageInfo->fMipMapped = GrMipMapped::kYes;
+ imageInfo->fMipMapped = GrMipmapped::kYes;
numberOfMipmapLevels = numRequiredLevels;
}
} else {
- imageInfo->fMipMapped = GrMipMapped::kNo;
+ imageInfo->fMipMapped = GrMipmapped::kNo;
}
if (!(header.ddspf.dwFlags & kDDPF_FOURCC)) {
@@ -285,7 +285,7 @@
size_t dataSize = SkCompressedDataSize(imageInfo->fCompressionType,
{ (int) header.dwWidth, (int) header.dwHeight },
&individualMipOffsets,
- imageInfo->fMipMapped == GrMipMapped::kYes);
+ imageInfo->fMipMapped == GrMipmapped::kYes);
SkASSERT(individualMipOffsets.size() == (size_t) numberOfMipmapLevels);
sk_sp<SkData> data = SkData::MakeUninitialized(dataSize);
@@ -343,7 +343,7 @@
sk_sp<SkData> data = load_ktx(GetResourcePath("images/flower-etc1.ktx").c_str(), &info);
if (data) {
SkASSERT(info.fDim.equals(kImgWidthHeight, kImgWidthHeight));
- SkASSERT(info.fMipMapped == GrMipMapped::kNo);
+ SkASSERT(info.fMipMapped == GrMipmapped::kNo);
SkASSERT(info.fCompressionType == SkImage::CompressionType::kETC2_RGB8_UNORM);
fETC1Image = data_to_img(direct, std::move(data), info);
@@ -357,7 +357,7 @@
sk_sp<SkData> data = load_dds(GetResourcePath("images/flower-bc1.dds").c_str(), &info);
if (data) {
SkASSERT(info.fDim.equals(kImgWidthHeight, kImgWidthHeight));
- SkASSERT(info.fMipMapped == GrMipMapped::kNo);
+ SkASSERT(info.fMipMapped == GrMipmapped::kNo);
SkASSERT(info.fCompressionType == SkImage::CompressionType::kBC1_RGB8_UNORM);
fBC1Image = data_to_img(direct, std::move(data), info);
diff --git a/gm/fp_sample_chaining.cpp b/gm/fp_sample_chaining.cpp
index 4ac6613..461c45c 100644
--- a/gm/fp_sample_chaining.cpp
+++ b/gm/fp_sample_chaining.cpp
@@ -228,7 +228,7 @@
#if 0
auto fp = std::unique_ptr<GrFragmentProcessor>(new TestPatternEffect());
#else
- auto view = maker.view(GrMipMapped::kNo);
+ auto view = maker.view(GrMipmapped::kNo);
auto fp = GrTextureEffect::Make(std::move(view), maker.alphaType());
#endif
for (EffectType effectType : effects) {
diff --git a/gm/fpcoordinateoverride.cpp b/gm/fpcoordinateoverride.cpp
index 3bdc130..f1392aa 100644
--- a/gm/fpcoordinateoverride.cpp
+++ b/gm/fpcoordinateoverride.cpp
@@ -80,7 +80,7 @@
SkBitmap bmp;
GetResourceAsBitmap("images/mandrill_512_q075.jpg", &bmp);
GrBitmapTextureMaker maker(ctx, bmp, GrImageTexGenPolicy::kDraw);
- auto view = maker.view(GrMipMapped::kNo);
+ auto view = maker.view(GrMipmapped::kNo);
if (!view) {
return;
}
diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp
index 997ff58..dd646ae 100644
--- a/gm/image_pict.cpp
+++ b/gm/image_pict.cpp
@@ -189,7 +189,7 @@
GrSurfaceProxyView onGenerateTexture(GrRecordingContext* rContext,
const SkImageInfo& info,
const SkIPoint& origin,
- GrMipMapped mipMapped,
+ GrMipmapped mipMapped,
GrImageTexGenPolicy policy) override {
SkASSERT(rContext);
SkASSERT(rContext == fRContext.get());
@@ -276,7 +276,7 @@
static void draw_as_tex(SkCanvas* canvas, SkImage* image, SkScalar x, SkScalar y) {
GrSurfaceProxyView view = as_IB(image)->refView(canvas->recordingContext(),
- GrMipMapped::kNo);
+ GrMipmapped::kNo);
if (!view) {
// show placeholder if we have no texture
SkPaint paint;
diff --git a/gm/imagefromyuvtextures.cpp b/gm/imagefromyuvtextures.cpp
index 324e190..82069d0 100644
--- a/gm/imagefromyuvtextures.cpp
+++ b/gm/imagefromyuvtextures.cpp
@@ -183,7 +183,7 @@
GrBackendTexture resultTexture = context->createBackendTexture(
fRGBABmp.dimensions().width(), fRGBABmp.dimensions().height(),
kRGBA_8888_SkColorType, SkColors::kTransparent,
- GrMipMapped::kNo, GrRenderable::kYes, GrProtected::kNo,
+ GrMipmapped::kNo, GrRenderable::kYes, GrProtected::kNo,
YUVABackendReleaseContext::CreationCompleteProc(0),
rgbaReleaseContext);
if (!resultTexture.isValid()) {
diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp
index 703631e..abdd2c4 100644
--- a/gm/rectangletexture.cpp
+++ b/gm/rectangletexture.cpp
@@ -99,7 +99,7 @@
SkASSERT(content.colorType() == kRGBA_8888_SkColorType);
auto format = GrBackendFormat::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_RECTANGLE);
auto bet = context->createBackendTexture(content.width(), content.height(), format,
- GrMipMapped::kNo, GrRenderable::kNo);
+ GrMipmapped::kNo, GrRenderable::kNo);
if (!bet.isValid()) {
return nullptr;
}
diff --git a/gm/sample_matrix_constant.cpp b/gm/sample_matrix_constant.cpp
index eaa603d..f87b3a4 100644
--- a/gm/sample_matrix_constant.cpp
+++ b/gm/sample_matrix_constant.cpp
@@ -79,11 +79,11 @@
SkBitmap bmp;
GetResourceAsBitmap("images/mandrill_256.png", &bmp);
GrBitmapTextureMaker maker(ctx, bmp, GrImageTexGenPolicy::kDraw);
- auto view = maker.view(GrMipMapped::kNo);
+ auto view = maker.view(GrMipmapped::kNo);
std::unique_ptr<GrFragmentProcessor> imgFP =
GrTextureEffect::Make(std::move(view), bmp.alphaType(), SkMatrix());
draw(std::move(imgFP), 0, 0);
- view = maker.view(GrMipMapped::kNo);
+ view = maker.view(GrMipmapped::kNo);
imgFP =
GrTextureEffect::Make(std::move(view), bmp.alphaType(), SkMatrix());
draw2(std::move(imgFP), 256, 0);
diff --git a/gm/sample_matrix_variable.cpp b/gm/sample_matrix_variable.cpp
index 092820a..84a34ab 100644
--- a/gm/sample_matrix_variable.cpp
+++ b/gm/sample_matrix_variable.cpp
@@ -82,7 +82,7 @@
SkBitmap bmp;
GetResourceAsBitmap("images/mandrill_256.png", &bmp);
GrBitmapTextureMaker maker(ctx, bmp, GrImageTexGenPolicy::kDraw);
- auto view = maker.view(GrMipMapped::kNo);
+ auto view = maker.view(GrMipmapped::kNo);
std::unique_ptr<GrFragmentProcessor> imgFP =
GrTextureEffect::Make(std::move(view), bmp.alphaType(), SkMatrix());
draw(std::move(imgFP), -128, 256, 0, 0);
diff --git a/gm/samplelocations.cpp b/gm/samplelocations.cpp
index 51475ab..6aec9d3 100644
--- a/gm/samplelocations.cpp
+++ b/gm/samplelocations.cpp
@@ -331,7 +331,7 @@
auto offscreenRTC = GrRenderTargetContext::Make(
ctx, rtc->colorInfo().colorType(), nullptr, SkBackingFit::kExact, {200, 200},
- rtc->numSamples(), GrMipMapped::kNo, GrProtected::kNo, fOrigin);
+ rtc->numSamples(), GrMipmapped::kNo, GrProtected::kNo, fOrigin);
if (!offscreenRTC) {
*errorMsg = "Failed to create offscreen render target.";
return DrawResult::kFail;
diff --git a/gm/swizzle.cpp b/gm/swizzle.cpp
index 0400371..62cb0a5 100644
--- a/gm/swizzle.cpp
+++ b/gm/swizzle.cpp
@@ -26,7 +26,7 @@
SkBitmap bmp;
GetResourceAsBitmap("images/mandrill_512_q075.jpg", &bmp);
GrBitmapTextureMaker maker(ctx, bmp, GrImageTexGenPolicy::kDraw);
- auto view = maker.view(GrMipMapped::kNo);
+ auto view = maker.view(GrMipmapped::kNo);
if (!view) {
return;
}
diff --git a/gm/texelsubset.cpp b/gm/texelsubset.cpp
index cfdd4ea..5a10182 100644
--- a/gm/texelsubset.cpp
+++ b/gm/texelsubset.cpp
@@ -77,9 +77,9 @@
DrawResult onDraw(GrRecordingContext* context, GrRenderTargetContext* renderTargetContext,
SkCanvas* canvas, SkString* errorMsg) override {
- GrMipMapped mipMapped = fFilter == GrSamplerState::Filter::kMipMap &&
+ GrMipmapped mipMapped = fFilter == GrSamplerState::Filter::kMipMap &&
context->priv().caps()->mipMapSupport()
- ? GrMipMapped::kYes : GrMipMapped::kNo;
+ ? GrMipmapped::kYes : GrMipmapped::kNo;
GrBitmapTextureMaker maker(context, fBitmap, GrImageTexGenPolicy::kDraw);
auto view = maker.view(mipMapped);
if (!view) {
diff --git a/gm/wacky_yuv_formats.cpp b/gm/wacky_yuv_formats.cpp
index 7e75163..4cf011a 100644
--- a/gm/wacky_yuv_formats.cpp
+++ b/gm/wacky_yuv_formats.cpp
@@ -1194,7 +1194,7 @@
GrBackendTexture tmp = dContext->createBackendTexture(shrunkPlaneSize.width(),
shrunkPlaneSize.height(),
curTex.getBackendFormat(),
- GrMipMapped::kNo,
+ GrMipmapped::kNo,
GrRenderable::kYes);
if (!tmp.isValid()) {
YUVABackendReleaseContext::Unwind(dContext, releaseContext, true);
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index dae49ac..24ed674 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -97,7 +97,7 @@
for (int i = 0; i < 3; ++i) {
GrBitmapTextureMaker maker(context, fBitmaps[i], GrImageTexGenPolicy::kDraw);
- views[i] = maker.view(GrMipMapped::kNo);
+ views[i] = maker.view(GrMipmapped::kNo);
if (!views[i]) {
*errorMsg = "Failed to create proxy";
return DrawResult::kFail;
@@ -213,7 +213,7 @@
for (int i = 0; i < 2; ++i) {
GrBitmapTextureMaker maker(context, fBitmaps[i], GrImageTexGenPolicy::kDraw);
- views[i] = maker.view(GrMipMapped::kNo);
+ views[i] = maker.view(GrMipmapped::kNo);
if (!views[i]) {
*errorMsg = "Failed to create proxy";
return DrawResult::kFail;
@@ -318,7 +318,7 @@
for (int i = 0; i < 3; ++i) {
GrBitmapTextureMaker maker(context, fBitmaps[i], GrImageTexGenPolicy::kDraw);
- views[i] = maker.view(GrMipMapped::kNo);
+ views[i] = maker.view(GrMipmapped::kNo);
if (!views[i]) {
*errorMsg = "Failed to create proxy";
return DrawResult::kFail;