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/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) {