Rename GrMipMapsStatus GrMipmapStatus
For consistency with other enums and public APIs.
Change-Id: I026da5529f11051693cae5691c7ad92fad5ed446
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304597
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h
index 465b590..9853c78 100644
--- a/include/private/GrTypesPriv.h
+++ b/include/private/GrTypesPriv.h
@@ -773,7 +773,7 @@
/**
* Used to describe the current state of Mips on a GrTexture
*/
-enum class GrMipMapsStatus {
+enum class GrMipmapStatus {
kNotAllocated, // Mips have not been allocated
kDirty, // Mips are allocated but the full mip tree does not have valid data
kValid, // All levels fully allocated and have valid data in them
diff --git a/src/core/SkDeferredDisplayListRecorder.cpp b/src/core/SkDeferredDisplayListRecorder.cpp
index 2e6ac52..9867725 100644
--- a/src/core/SkDeferredDisplayListRecorder.cpp
+++ b/src/core/SkDeferredDisplayListRecorder.cpp
@@ -172,7 +172,7 @@
fCharacterization.sampleCount(),
surfaceFlags,
optionalTextureInfo,
- GrMipMapsStatus::kNotAllocated,
+ GrMipmapStatus::kNotAllocated,
SkBackingFit::kExact,
SkBudgeted::kYes,
fCharacterization.isProtected(),
diff --git a/src/gpu/GrAHardwareBufferImageGenerator.cpp b/src/gpu/GrAHardwareBufferImageGenerator.cpp
index 7aa3074..4c03867 100644
--- a/src/gpu/GrAHardwareBufferImageGenerator.cpp
+++ b/src/gpu/GrAHardwareBufferImageGenerator.cpp
@@ -179,7 +179,7 @@
return tex;
},
backendFormat, {width, height}, GrRenderable::kNo, 1, GrMipmapped::kNo,
- GrMipMapsStatus::kNotAllocated, GrInternalSurfaceFlags::kReadOnly, SkBackingFit::kExact,
+ GrMipmapStatus::kNotAllocated, GrInternalSurfaceFlags::kReadOnly, SkBackingFit::kExact,
SkBudgeted::kNo, GrProtected(fIsProtectedContent), GrSurfaceProxy::UseAllocator::kYes);
GrSwizzle readSwizzle = context->priv().caps()->getReadSwizzle(backendFormat, grColorType);
diff --git a/src/gpu/GrBackendTextureImageGenerator.cpp b/src/gpu/GrBackendTextureImageGenerator.cpp
index b1a7dd3..a56fdd4 100644
--- a/src/gpu/GrBackendTextureImageGenerator.cpp
+++ b/src/gpu/GrBackendTextureImageGenerator.cpp
@@ -152,8 +152,8 @@
// Ganesh assumes that, when wrapping a mipmapped backend texture from a client, that its
// mipmaps are fully fleshed out.
- GrMipMapsStatus mipMapsStatus = fBackendTexture.hasMipMaps()
- ? GrMipMapsStatus::kValid : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = fBackendTexture.hasMipMaps()
+ ? GrMipmapStatus::kValid : GrMipmapStatus::kNotAllocated;
GrSwizzle readSwizzle = context->priv().caps()->getReadSwizzle(backendFormat, grColorType);
@@ -202,7 +202,7 @@
return {std::move(tex), true, GrSurfaceProxy::LazyInstantiationKeyMode::kUnsynced};
},
backendFormat, fBackendTexture.dimensions(), GrRenderable::kNo, 1, textureIsMipMapped,
- mipMapsStatus, GrInternalSurfaceFlags::kReadOnly, SkBackingFit::kExact, SkBudgeted::kNo,
+ mipmapStatus, GrInternalSurfaceFlags::kReadOnly, SkBackingFit::kExact, SkBudgeted::kNo,
GrProtected::kNo, GrSurfaceProxy::UseAllocator::kYes);
if (!proxy) {
return {};
diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index 883cd3c..6cc24e0 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -329,7 +329,7 @@
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, GrMipmapStatus::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, GrMipmapStatus::kValid,
GrInternalSurfaceFlags::kNone, SkBackingFit::kExact, budgeted, GrProtected::kNo,
UseAllocator::kYes);
@@ -424,20 +424,20 @@
mipMapped)) {
return nullptr;
}
- GrMipMapsStatus mipMapsStatus = (GrMipmapped::kYes == mipMapped)
- ? GrMipMapsStatus::kDirty
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = (GrMipmapped::kYes == mipMapped)
+ ? GrMipmapStatus::kDirty
+ : GrMipmapStatus::kNotAllocated;
if (renderable == GrRenderable::kYes) {
renderTargetSampleCnt = caps->getRenderTargetSampleCount(renderTargetSampleCnt, format);
SkASSERT(renderTargetSampleCnt);
// We know anything we instantiate later from this deferred path will be
// both texturable and renderable
return sk_sp<GrTextureProxy>(new GrTextureRenderTargetProxy(
- *caps, format, dimensions, renderTargetSampleCnt, mipMapped, mipMapsStatus, fit,
+ *caps, format, dimensions, renderTargetSampleCnt, mipMapped, mipmapStatus, fit,
budgeted, isProtected, surfaceFlags, useAllocator, this->isDDLProvider()));
}
- return sk_sp<GrTextureProxy>(new GrTextureProxy(format, dimensions, mipMapped, mipMapsStatus,
+ return sk_sp<GrTextureProxy>(new GrTextureProxy(format, dimensions, mipMapped, mipmapStatus,
fit, budgeted, isProtected, surfaceFlags,
useAllocator, this->isDDLProvider()));
}
@@ -456,9 +456,8 @@
return nullptr;
}
- GrMipMapsStatus mipMapsStatus = (GrMipmapped::kYes == mipMapped)
- ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = (GrMipmapped::kYes == mipMapped) ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
sk_sp<GrTextureProxy> proxy = this->createLazyProxy(
[data](GrResourceProvider* resourceProvider, const LazySurfaceDesc& desc) {
@@ -466,7 +465,7 @@
desc.fDimensions, desc.fFormat, desc.fBudgeted, desc.fMipMapped,
desc.fProtected, data.get()));
},
- format, dimensions, GrRenderable::kNo, 1, mipMapped, mipMapsStatus,
+ format, dimensions, GrRenderable::kNo, 1, mipMapped, mipmapStatus,
GrInternalSurfaceFlags::kReadOnly, SkBackingFit::kExact, SkBudgeted::kYes,
GrProtected::kNo, UseAllocator::kYes);
@@ -700,7 +699,7 @@
GrRenderable renderable,
int renderTargetSampleCnt,
GrMipmapped mipMapped,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
GrInternalSurfaceFlags surfaceFlags,
SkBackingFit fit,
SkBudgeted budgeted,
@@ -729,7 +728,7 @@
dimensions,
renderTargetSampleCnt,
mipMapped,
- mipMapsStatus,
+ mipmapStatus,
fit,
budgeted,
isProtected,
@@ -741,7 +740,7 @@
format,
dimensions,
mipMapped,
- mipMapsStatus,
+ mipmapStatus,
fit,
budgeted,
isProtected,
@@ -758,7 +757,7 @@
int sampleCnt,
GrInternalSurfaceFlags surfaceFlags,
const TextureInfo* textureInfo,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
SkBackingFit fit,
SkBudgeted budgeted,
GrProtected isProtected,
@@ -782,7 +781,7 @@
SkASSERT(!wrapsVkSecondaryCB);
return sk_sp<GrRenderTargetProxy>(new GrTextureRenderTargetProxy(
*this->caps(), std::move(callback), format, dimensions, sampleCnt,
- textureInfo->fMipMapped, mipMapsStatus, fit, budgeted, isProtected, surfaceFlags,
+ textureInfo->fMipMapped, mipmapStatus, fit, budgeted, isProtected, surfaceFlags,
useAllocator, this->isDDLProvider()));
}
@@ -815,12 +814,12 @@
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, GrMipmapStatus::kNotAllocated, SkBackingFit::kApprox,
SkBudgeted::kYes, isProtected, surfaceFlags, useAllocator, GrDDLProvider::kNo));
} else {
return sk_sp<GrTextureProxy>(
new GrTextureProxy(std::move(callback), format, kLazyDims, GrMipmapped::kNo,
- GrMipMapsStatus::kNotAllocated, SkBackingFit::kApprox,
+ GrMipmapStatus::kNotAllocated, SkBackingFit::kApprox,
SkBudgeted::kYes, isProtected, surfaceFlags, useAllocator,
GrDDLProvider::kNo));
}
diff --git a/src/gpu/GrProxyProvider.h b/src/gpu/GrProxyProvider.h
index a329603..5e751e1 100644
--- a/src/gpu/GrProxyProvider.h
+++ b/src/gpu/GrProxyProvider.h
@@ -171,7 +171,7 @@
GrRenderable,
int renderTargetSampleCnt,
GrMipmapped,
- GrMipMapsStatus,
+ GrMipmapStatus,
GrInternalSurfaceFlags,
SkBackingFit,
SkBudgeted,
@@ -185,7 +185,7 @@
int renderTargetSampleCnt,
GrInternalSurfaceFlags,
const TextureInfo*,
- GrMipMapsStatus,
+ GrMipmapStatus,
SkBackingFit,
SkBudgeted,
GrProtected,
diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index 3cf9de6..8cf48c3 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -23,14 +23,14 @@
#endif
void GrTexture::markMipMapsDirty() {
- if (GrMipMapsStatus::kValid == fMipMapsStatus) {
- fMipMapsStatus = GrMipMapsStatus::kDirty;
+ if (GrMipmapStatus::kValid == fMipMapsStatus) {
+ fMipMapsStatus = GrMipmapStatus::kDirty;
}
}
void GrTexture::markMipMapsClean() {
- SkASSERT(GrMipMapsStatus::kNotAllocated != fMipMapsStatus);
- fMipMapsStatus = GrMipMapsStatus::kValid;
+ SkASSERT(GrMipmapStatus::kNotAllocated != fMipMapsStatus);
+ fMipMapsStatus = GrMipmapStatus::kValid;
}
size_t GrTexture::onGpuMemorySize() const {
@@ -44,11 +44,11 @@
const SkISize& dimensions,
GrProtected isProtected,
GrTextureType textureType,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: INHERITED(gpu, dimensions, isProtected)
, fTextureType(textureType)
- , fMipMapsStatus(mipMapsStatus) {
- if (GrMipMapsStatus::kNotAllocated == fMipMapsStatus) {
+ , fMipMapsStatus(mipmapStatus) {
+ if (GrMipmapStatus::kNotAllocated == fMipMapsStatus) {
fMaxMipMapLevel = 0;
} else {
fMaxMipMapLevel = SkMipmap::ComputeLevelCount(this->width(), this->height());
diff --git a/src/gpu/GrTexture.h b/src/gpu/GrTexture.h
index b22cfde..e8ab0ee 100644
--- a/src/gpu/GrTexture.h
+++ b/src/gpu/GrTexture.h
@@ -74,7 +74,7 @@
inline const GrTexturePriv texturePriv() const;
protected:
- GrTexture(GrGpu*, const SkISize&, GrProtected, GrTextureType, GrMipMapsStatus);
+ GrTexture(GrGpu*, const SkISize&, GrProtected, GrTextureType, GrMipmapStatus);
virtual bool onStealBackendTexture(GrBackendTexture*, SkImage::BackendTextureReleaseProc*) = 0;
@@ -93,7 +93,7 @@
void markMipMapsClean();
GrTextureType fTextureType;
- GrMipMapsStatus fMipMapsStatus;
+ GrMipmapStatus fMipMapsStatus;
int fMaxMipMapLevel;
friend class GrTexturePriv;
friend class GrTextureResource;
diff --git a/src/gpu/GrTexturePriv.h b/src/gpu/GrTexturePriv.h
index 99a918f..e84832b 100644
--- a/src/gpu/GrTexturePriv.h
+++ b/src/gpu/GrTexturePriv.h
@@ -26,14 +26,12 @@
fTexture->markMipMapsClean();
}
- GrMipMapsStatus mipMapsStatus() const { return fTexture->fMipMapsStatus; }
+ GrMipmapStatus mipmapStatus() const { return fTexture->fMipMapsStatus; }
- bool mipMapsAreDirty() const {
- return GrMipMapsStatus::kValid != this->mipMapsStatus();
- }
+ bool mipMapsAreDirty() const { return GrMipmapStatus::kValid != this->mipmapStatus(); }
GrMipmapped mipMapped() const {
- if (GrMipMapsStatus::kNotAllocated != this->mipMapsStatus()) {
+ if (GrMipmapStatus::kNotAllocated != this->mipmapStatus()) {
return GrMipmapped::kYes;
}
return GrMipmapped::kNo;
diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp
index 80a3b5f..cb3adf8 100644
--- a/src/gpu/GrTextureProxy.cpp
+++ b/src/gpu/GrTextureProxy.cpp
@@ -19,7 +19,7 @@
GrTextureProxy::GrTextureProxy(const GrBackendFormat& format,
SkISize dimensions,
GrMipmapped mipMapped,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
SkBackingFit fit,
SkBudgeted budgeted,
GrProtected isProtected,
@@ -28,7 +28,7 @@
GrDDLProvider creatingProvider)
: INHERITED(format, dimensions, fit, budgeted, isProtected, surfaceFlags, useAllocator)
, fMipMapped(mipMapped)
- , fMipMapsStatus(mipMapsStatus)
+ , fMipMapsStatus(mipmapStatus)
SkDEBUGCODE(, fInitialMipMapsStatus(fMipMapsStatus))
, fCreatingProvider(creatingProvider)
, fProxyProvider(nullptr)
@@ -41,7 +41,7 @@
const GrBackendFormat& format,
SkISize dimensions,
GrMipmapped mipMapped,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
SkBackingFit fit,
SkBudgeted budgeted,
GrProtected isProtected,
@@ -51,7 +51,7 @@
: INHERITED(std::move(callback), format, dimensions, fit, budgeted, isProtected,
surfaceFlags, useAllocator)
, fMipMapped(mipMapped)
- , fMipMapsStatus(mipMapsStatus)
+ , fMipMapsStatus(mipmapStatus)
SkDEBUGCODE(, fInitialMipMapsStatus(fMipMapsStatus))
, fCreatingProvider(creatingProvider)
, fProxyProvider(nullptr)
@@ -65,7 +65,7 @@
GrDDLProvider creatingProvider)
: INHERITED(std::move(surf), SkBackingFit::kExact, useAllocator)
, fMipMapped(fTarget->asTexture()->texturePriv().mipMapped())
- , fMipMapsStatus(fTarget->asTexture()->texturePriv().mipMapsStatus())
+ , fMipMapsStatus(fTarget->asTexture()->texturePriv().mipmapStatus())
SkDEBUGCODE(, fInitialMipMapsStatus(fMipMapsStatus))
, fCreatingProvider(creatingProvider)
, fProxyProvider(nullptr)
diff --git a/src/gpu/GrTextureProxy.h b/src/gpu/GrTextureProxy.h
index 2fa7b06..f199e3b 100644
--- a/src/gpu/GrTextureProxy.h
+++ b/src/gpu/GrTextureProxy.h
@@ -35,16 +35,16 @@
bool mipMapsAreDirty() const {
SkASSERT((GrMipmapped::kNo == fMipMapped) ==
- (GrMipMapsStatus::kNotAllocated == fMipMapsStatus));
- return GrMipmapped::kYes == fMipMapped && GrMipMapsStatus::kValid != fMipMapsStatus;
+ (GrMipmapStatus::kNotAllocated == fMipMapsStatus));
+ return GrMipmapped::kYes == fMipMapped && GrMipmapStatus::kValid != fMipMapsStatus;
}
void markMipMapsDirty() {
SkASSERT(GrMipmapped::kYes == fMipMapped);
- fMipMapsStatus = GrMipMapsStatus::kDirty;
+ fMipMapsStatus = GrMipmapStatus::kDirty;
}
void markMipMapsClean() {
SkASSERT(GrMipmapped::kYes == fMipMapped);
- fMipMapsStatus = GrMipMapsStatus::kValid;
+ fMipMapsStatus = GrMipmapStatus::kValid;
}
// Returns the GrMipmapped value of the proxy from creation time regardless of whether it has
@@ -114,7 +114,7 @@
GrTextureProxy(const GrBackendFormat&,
SkISize,
GrMipmapped,
- GrMipMapsStatus,
+ GrMipmapStatus,
SkBackingFit,
SkBudgeted,
GrProtected,
@@ -136,7 +136,7 @@
const GrBackendFormat&,
SkISize,
GrMipmapped,
- GrMipMapsStatus,
+ GrMipmapStatus,
SkBackingFit,
SkBudgeted,
GrProtected,
@@ -170,14 +170,14 @@
// 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
// mipmap levels need to be explicitly regenerated during the execution of a DAG of opsTasks.
- GrMipMapsStatus fMipMapsStatus;
- // TEMPORARY: We are in the process of moving GrMipMapsStatus from the texture to the proxy.
+ GrMipmapStatus fMipMapsStatus;
+ // TEMPORARY: We are in the process of moving GrMipmapStatus from the texture to the proxy.
// We track the fInitialMipMapsStatus here so we can assert that the proxy did indeed expect
// the correct mipmap status immediately after instantiation.
//
// NOTE: fMipMapsStatus may no longer be equal to fInitialMipMapsStatus by the time the texture
// is instantiated, since it tracks mipmaps in the time frame in which the DAG is being built.
- SkDEBUGCODE(const GrMipMapsStatus fInitialMipMapsStatus;)
+ SkDEBUGCODE(const GrMipmapStatus fInitialMipMapsStatus;)
bool fSyncTargetKey = true; // Should target's unique key be sync'ed with ours.
diff --git a/src/gpu/GrTextureRenderTargetProxy.cpp b/src/gpu/GrTextureRenderTargetProxy.cpp
index 82a67d4..1c6fa84 100644
--- a/src/gpu/GrTextureRenderTargetProxy.cpp
+++ b/src/gpu/GrTextureRenderTargetProxy.cpp
@@ -29,7 +29,7 @@
SkISize dimensions,
int sampleCnt,
GrMipmapped mipMapped,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
SkBackingFit fit,
SkBudgeted budgeted,
GrProtected isProtected,
@@ -40,7 +40,7 @@
// for now textures w/ data are always wrapped
, GrRenderTargetProxy(caps, format, dimensions, sampleCnt, fit, budgeted, isProtected,
surfaceFlags, useAllocator)
- , GrTextureProxy(format, dimensions, mipMapped, mipMapsStatus, fit, budgeted, isProtected,
+ , GrTextureProxy(format, dimensions, mipMapped, mipmapStatus, fit, budgeted, isProtected,
surfaceFlags, useAllocator, creatingProvider) {
this->initSurfaceFlags(caps);
}
@@ -52,7 +52,7 @@
SkISize dimensions,
int sampleCnt,
GrMipmapped mipMapped,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
SkBackingFit fit,
SkBudgeted budgeted,
GrProtected isProtected,
@@ -66,7 +66,7 @@
, GrRenderTargetProxy(LazyInstantiateCallback(), format, dimensions, sampleCnt, fit,
budgeted, isProtected, surfaceFlags, useAllocator,
WrapsVkSecondaryCB::kNo)
- , GrTextureProxy(LazyInstantiateCallback(), format, dimensions, mipMapped, mipMapsStatus,
+ , GrTextureProxy(LazyInstantiateCallback(), format, dimensions, mipMapped, mipmapStatus,
fit, budgeted, isProtected, surfaceFlags, useAllocator,
creatingProvider) {
this->initSurfaceFlags(caps);
diff --git a/src/gpu/GrTextureRenderTargetProxy.h b/src/gpu/GrTextureRenderTargetProxy.h
index 9ea5396..4548261 100644
--- a/src/gpu/GrTextureRenderTargetProxy.h
+++ b/src/gpu/GrTextureRenderTargetProxy.h
@@ -33,7 +33,7 @@
SkISize,
int sampleCnt,
GrMipmapped,
- GrMipMapsStatus,
+ GrMipmapStatus,
SkBackingFit,
SkBudgeted,
GrProtected,
@@ -48,7 +48,7 @@
SkISize,
int sampleCnt,
GrMipmapped,
- GrMipMapsStatus,
+ GrMipmapStatus,
SkBackingFit,
SkBudgeted,
GrProtected,
diff --git a/src/gpu/d3d/GrD3DGpu.cpp b/src/gpu/d3d/GrD3DGpu.cpp
index f9f0202..af75ce6 100644
--- a/src/gpu/d3d/GrD3DGpu.cpp
+++ b/src/gpu/d3d/GrD3DGpu.cpp
@@ -224,7 +224,7 @@
SkBudgeted budgeted,
GrProtected isProtected,
int mipLevelCount,
- GrMipMapsStatus mipMapsStatus) {
+ GrMipmapStatus mipmapStatus) {
D3D12_RESOURCE_FLAGS usageFlags = D3D12_RESOURCE_FLAG_NONE;
if (renderable == GrRenderable::kYes) {
usageFlags |= D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
@@ -253,10 +253,10 @@
if (renderable == GrRenderable::kYes) {
return GrD3DTextureRenderTarget::MakeNewTextureRenderTarget(
this, budgeted, dimensions, renderTargetSampleCnt, resourceDesc, isProtected,
- mipMapsStatus);
+ mipmapStatus);
} else {
return GrD3DTexture::MakeNewTexture(this, budgeted, dimensions, resourceDesc, isProtected,
- mipMapsStatus);
+ mipmapStatus);
}
}
@@ -272,12 +272,12 @@
SkAssertResult(format.asDxgiFormat(&dxgiFormat));
SkASSERT(!GrDxgiFormatIsCompressed(dxgiFormat));
- GrMipMapsStatus mipMapsStatus = mipLevelCount > 1 ? GrMipMapsStatus::kDirty
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = mipLevelCount > 1 ? GrMipmapStatus::kDirty
+ : GrMipmapStatus::kNotAllocated;
sk_sp<GrD3DTexture> tex = this->createD3DTexture(dimensions, dxgiFormat, renderable,
renderTargetSampleCnt, budgeted, isProtected,
- mipLevelCount, mipMapsStatus);
+ mipLevelCount, mipmapStatus);
if (!tex) {
return nullptr;
}
@@ -326,12 +326,12 @@
if (mipMapped == GrMipmapped::kYes) {
mipLevelCount = SkMipmap::ComputeLevelCount(dimensions.width(), dimensions.height()) + 1;
}
- GrMipMapsStatus mipMapsStatus = mipLevelCount > 1 ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = mipLevelCount > 1 ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
sk_sp<GrD3DTexture> d3dTex = this->createD3DTexture(dimensions, dxgiFormat, GrRenderable::kNo,
1, budgeted, isProtected,
- mipLevelCount, mipMapsStatus);
+ mipLevelCount, mipmapStatus);
if (!d3dTex) {
return nullptr;
}
diff --git a/src/gpu/d3d/GrD3DGpu.h b/src/gpu/d3d/GrD3DGpu.h
index 2cacbf1..c7b8361 100644
--- a/src/gpu/d3d/GrD3DGpu.h
+++ b/src/gpu/d3d/GrD3DGpu.h
@@ -238,7 +238,7 @@
SkBudgeted,
GrProtected,
int mipLevelCount,
- GrMipMapsStatus);
+ GrMipmapStatus);
bool uploadToTexture(GrD3DTexture* tex, int left, int top, int width, int height,
GrColorType colorType, const GrMipLevel* texels, int mipLevelCount);
diff --git a/src/gpu/d3d/GrD3DTexture.cpp b/src/gpu/d3d/GrD3DTexture.cpp
index b59fb4d..dca4050 100644
--- a/src/gpu/d3d/GrD3DTexture.cpp
+++ b/src/gpu/d3d/GrD3DTexture.cpp
@@ -20,12 +20,12 @@
const GrD3DTextureResourceInfo& info,
sk_sp<GrD3DResourceState> state,
const GrD3DDescriptorHeap::CPUHandle& shaderResourceView,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, info.fProtected)
, GrD3DTextureResource(info, std::move(state))
- , INHERITED(gpu, dimensions, info.fProtected, GrTextureType::k2D, mipMapsStatus)
+ , INHERITED(gpu, dimensions, info.fProtected, GrTextureType::k2D, mipmapStatus)
, fShaderResourceView(shaderResourceView) {
- SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == info.fLevelCount));
+ SkASSERT((GrMipmapStatus::kNotAllocated == mipmapStatus) == (1 == info.fLevelCount));
this->registerWithCache(budgeted);
if (GrDxgiFormatIsCompressed(info.fFormat)) {
this->setReadOnly();
@@ -35,13 +35,13 @@
GrD3DTexture::GrD3DTexture(GrD3DGpu* gpu, SkISize dimensions, const GrD3DTextureResourceInfo& info,
sk_sp<GrD3DResourceState> state,
const GrD3DDescriptorHeap::CPUHandle& shaderResourceView,
- GrMipMapsStatus mipMapsStatus, GrWrapCacheable cacheable,
+ GrMipmapStatus mipmapStatus, GrWrapCacheable cacheable,
GrIOType ioType)
: GrSurface(gpu, dimensions, info.fProtected)
, GrD3DTextureResource(info, std::move(state))
- , INHERITED(gpu, dimensions, info.fProtected, GrTextureType::k2D, mipMapsStatus)
+ , INHERITED(gpu, dimensions, info.fProtected, GrTextureType::k2D, mipmapStatus)
, fShaderResourceView(shaderResourceView) {
- SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == info.fLevelCount));
+ SkASSERT((GrMipmapStatus::kNotAllocated == mipmapStatus) == (1 == info.fLevelCount));
if (ioType == kRead_GrIOType) {
this->setReadOnly();
}
@@ -54,19 +54,19 @@
const GrD3DTextureResourceInfo& info,
sk_sp<GrD3DResourceState> state,
const GrD3DDescriptorHeap::CPUHandle& shaderResourceView,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, info.fProtected)
, GrD3DTextureResource(info, state)
- , INHERITED(gpu, dimensions, info.fProtected, GrTextureType::k2D, mipMapsStatus)
+ , INHERITED(gpu, dimensions, info.fProtected, GrTextureType::k2D, mipmapStatus)
, fShaderResourceView(shaderResourceView) {
- SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == info.fLevelCount));
+ SkASSERT((GrMipmapStatus::kNotAllocated == mipmapStatus) == (1 == info.fLevelCount));
}
sk_sp<GrD3DTexture> GrD3DTexture::MakeNewTexture(GrD3DGpu* gpu, SkBudgeted budgeted,
SkISize dimensions,
const D3D12_RESOURCE_DESC& desc,
GrProtected isProtected,
- GrMipMapsStatus mipMapsStatus) {
+ GrMipmapStatus mipmapStatus) {
GrD3DTextureResourceInfo info;
if (!GrD3DTextureResource::InitTextureResourceInfo(gpu, desc,
D3D12_RESOURCE_STATE_COPY_DEST,
@@ -81,7 +81,7 @@
gpu->resourceProvider().createShaderResourceView(info.fResource.get());
GrD3DTexture* tex = new GrD3DTexture(gpu, budgeted, dimensions, info, std::move(state),
- shaderResourceView, mipMapsStatus);
+ shaderResourceView, mipmapStatus);
return sk_sp<GrD3DTexture>(tex);
}
@@ -97,14 +97,14 @@
//SkASSERT(info.fTexture &&
// (kBorrow_GrWrapOwnership == wrapOwnership || VK_NULL_HANDLE != info.fAlloc.fMemory));
- GrMipMapsStatus mipMapsStatus = info.fLevelCount > 1 ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = info.fLevelCount > 1 ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
GrD3DDescriptorHeap::CPUHandle shaderResourceView =
gpu->resourceProvider().createShaderResourceView(info.fResource.get());
return sk_sp<GrD3DTexture>(new GrD3DTexture(gpu, dimensions, info, std::move(state),
- shaderResourceView, mipMapsStatus, cacheable,
+ shaderResourceView, mipmapStatus, cacheable,
ioType));
}
diff --git a/src/gpu/d3d/GrD3DTexture.h b/src/gpu/d3d/GrD3DTexture.h
index 2e923a8..8856f61 100644
--- a/src/gpu/d3d/GrD3DTexture.h
+++ b/src/gpu/d3d/GrD3DTexture.h
@@ -21,7 +21,7 @@
SkISize dimensions,
const D3D12_RESOURCE_DESC&,
GrProtected,
- GrMipMapsStatus);
+ GrMipmapStatus);
static sk_sp<GrD3DTexture> MakeWrappedTexture(GrD3DGpu*,
SkISize dimensions,
@@ -48,7 +48,7 @@
const GrD3DTextureResourceInfo&,
sk_sp<GrD3DResourceState>,
const GrD3DDescriptorHeap::CPUHandle& shaderResourceView,
- GrMipMapsStatus);
+ GrMipmapStatus);
GrD3DGpu* getD3DGpu() const;
@@ -65,11 +65,11 @@
GrD3DTexture(GrD3DGpu*, SkBudgeted, SkISize dimensions, const GrD3DTextureResourceInfo&,
sk_sp<GrD3DResourceState>,
const GrD3DDescriptorHeap::CPUHandle& shaderResourceView,
- GrMipMapsStatus);
+ GrMipmapStatus);
GrD3DTexture(GrD3DGpu*, SkISize dimensions, const GrD3DTextureResourceInfo&,
sk_sp<GrD3DResourceState>,
const GrD3DDescriptorHeap::CPUHandle& shaderResourceView,
- GrMipMapsStatus, GrWrapCacheable, GrIOType);
+ GrMipmapStatus, GrWrapCacheable, GrIOType);
// In D3D we call the release proc after we are finished with the underlying
// GrSurfaceResource::Resource object (which occurs after the GPU has finished all work on it).
diff --git a/src/gpu/d3d/GrD3DTextureRenderTarget.cpp b/src/gpu/d3d/GrD3DTextureRenderTarget.cpp
index 50e1cb0..c977ea8 100644
--- a/src/gpu/d3d/GrD3DTextureRenderTarget.cpp
+++ b/src/gpu/d3d/GrD3DTextureRenderTarget.cpp
@@ -17,10 +17,10 @@
const GrD3DTextureResourceInfo& msaaInfo, sk_sp<GrD3DResourceState> msaaState,
const GrD3DDescriptorHeap::CPUHandle& colorRenderTargetView,
const GrD3DDescriptorHeap::CPUHandle& resolveRenderTargetView,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, info.fProtected)
, GrD3DTextureResource(info, state)
- , GrD3DTexture(gpu, dimensions, info, state, shaderResourceView, mipMapsStatus)
+ , GrD3DTexture(gpu, dimensions, info, state, shaderResourceView, mipmapStatus)
, GrD3DRenderTarget(gpu, dimensions, sampleCnt, info, state, msaaInfo,
std::move(msaaState), colorRenderTargetView, resolveRenderTargetView) {
SkASSERT(info.fProtected == msaaInfo.fProtected);
@@ -32,10 +32,10 @@
const GrD3DTextureResourceInfo& info, sk_sp<GrD3DResourceState> state,
const GrD3DDescriptorHeap::CPUHandle& shaderResourceView,
const GrD3DDescriptorHeap::CPUHandle& renderTargetView,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, info.fProtected)
, GrD3DTextureResource(info, state)
- , GrD3DTexture(gpu, dimensions, info, state, shaderResourceView, mipMapsStatus)
+ , GrD3DTexture(gpu, dimensions, info, state, shaderResourceView, mipmapStatus)
, GrD3DRenderTarget(gpu, dimensions, info, state, renderTargetView) {
this->registerWithCache(budgeted);
}
@@ -47,11 +47,11 @@
const GrD3DTextureResourceInfo& msaaInfo, sk_sp<GrD3DResourceState> msaaState,
const GrD3DDescriptorHeap::CPUHandle& colorRenderTargetView,
const GrD3DDescriptorHeap::CPUHandle& resolveRenderTargetView,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
GrWrapCacheable cacheable)
: GrSurface(gpu, dimensions, info.fProtected)
, GrD3DTextureResource(info, state)
- , GrD3DTexture(gpu, dimensions, info, state, shaderResourceView, mipMapsStatus)
+ , GrD3DTexture(gpu, dimensions, info, state, shaderResourceView, mipmapStatus)
, GrD3DRenderTarget(gpu, dimensions, sampleCnt, info, state, msaaInfo,
std::move(msaaState), colorRenderTargetView, resolveRenderTargetView) {
SkASSERT(info.fProtected == msaaInfo.fProtected);
@@ -63,11 +63,11 @@
const GrD3DTextureResourceInfo& info, sk_sp<GrD3DResourceState> state,
const GrD3DDescriptorHeap::CPUHandle& shaderResourceView,
const GrD3DDescriptorHeap::CPUHandle& renderTargetView,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
GrWrapCacheable cacheable)
: GrSurface(gpu, dimensions, info.fProtected)
, GrD3DTextureResource(info, state)
- , GrD3DTexture(gpu, dimensions, info, state, shaderResourceView, mipMapsStatus)
+ , GrD3DTexture(gpu, dimensions, info, state, shaderResourceView, mipmapStatus)
, GrD3DRenderTarget(gpu, dimensions, info, state, renderTargetView) {
this->registerWithCacheWrapped(cacheable);
}
@@ -79,7 +79,7 @@
int sampleCnt,
const D3D12_RESOURCE_DESC& resourceDesc,
GrProtected isProtected,
- GrMipMapsStatus mipMapsStatus) {
+ GrMipmapStatus mipmapStatus) {
GrD3DTextureResourceInfo info;
D3D12_RESOURCE_STATES initialState = sampleCnt > 1 ? D3D12_RESOURCE_STATE_RESOLVE_DEST
@@ -118,12 +118,12 @@
GrD3DTextureRenderTarget* trt = new GrD3DTextureRenderTarget(
gpu, budgeted, dimensions, sampleCnt, info, std::move(state), shaderResourceView,
- msInfo, std::move(msState), msaaRenderTargetView, renderTargetView, mipMapsStatus);
+ msInfo, std::move(msState), msaaRenderTargetView, renderTargetView, mipmapStatus);
return sk_sp<GrD3DTextureRenderTarget>(trt);
} else {
GrD3DTextureRenderTarget* trt = new GrD3DTextureRenderTarget(
gpu, budgeted, dimensions, info, std::move(state), shaderResourceView,
- renderTargetView, mipMapsStatus);
+ renderTargetView, mipmapStatus);
return sk_sp<GrD3DTextureRenderTarget>(trt);
}
}
@@ -140,8 +140,8 @@
//SkASSERT(VK_NULL_HANDLE != info.fImage &&
// (kBorrow_GrWrapOwnership == wrapOwnership || VK_NULL_HANDLE != info.fAlloc.fMemory));
- GrMipMapsStatus mipMapsStatus = info.fLevelCount > 1 ? GrMipMapsStatus::kDirty
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = info.fLevelCount > 1 ? GrMipmapStatus::kDirty
+ : GrMipmapStatus::kNotAllocated;
const GrD3DDescriptorHeap::CPUHandle shaderResourceView =
gpu->resourceProvider().createShaderResourceView(info.fResource.get());
@@ -162,13 +162,13 @@
GrD3DTextureRenderTarget* trt = new GrD3DTextureRenderTarget(
gpu, dimensions, sampleCnt, info, std::move(state), shaderResourceView,
- msInfo, std::move(msState), msaaRenderTargetView, renderTargetView, mipMapsStatus,
+ msInfo, std::move(msState), msaaRenderTargetView, renderTargetView, mipmapStatus,
cacheable);
return sk_sp<GrD3DTextureRenderTarget>(trt);
} else {
return sk_sp<GrD3DTextureRenderTarget>(new GrD3DTextureRenderTarget(
gpu, dimensions, info, std::move(state), shaderResourceView, renderTargetView,
- mipMapsStatus, cacheable));
+ mipmapStatus, cacheable));
}
}
diff --git a/src/gpu/d3d/GrD3DTextureRenderTarget.h b/src/gpu/d3d/GrD3DTextureRenderTarget.h
index 46d3ca5..4135282 100644
--- a/src/gpu/d3d/GrD3DTextureRenderTarget.h
+++ b/src/gpu/d3d/GrD3DTextureRenderTarget.h
@@ -30,7 +30,7 @@
int sampleCnt,
const D3D12_RESOURCE_DESC&,
GrProtected isProtected,
- GrMipMapsStatus);
+ GrMipmapStatus);
static sk_sp<GrD3DTextureRenderTarget> MakeWrappedTextureRenderTarget(
GrD3DGpu*, SkISize dimensions, int sampleCnt, GrWrapCacheable,
@@ -64,7 +64,7 @@
sk_sp<GrD3DResourceState> msaaState,
const GrD3DDescriptorHeap::CPUHandle& colorRenderTargetView,
const GrD3DDescriptorHeap::CPUHandle& resolveRenderTargetView,
- GrMipMapsStatus);
+ GrMipmapStatus);
// non-MSAA, not-wrapped
GrD3DTextureRenderTarget(GrD3DGpu* gpu,
@@ -74,7 +74,7 @@
sk_sp<GrD3DResourceState> state,
const GrD3DDescriptorHeap::CPUHandle& shaderResourceView,
const GrD3DDescriptorHeap::CPUHandle& renderTargetView,
- GrMipMapsStatus);
+ GrMipmapStatus);
// MSAA, wrapped
GrD3DTextureRenderTarget(GrD3DGpu* gpu,
@@ -87,7 +87,7 @@
sk_sp<GrD3DResourceState> msaaState,
const GrD3DDescriptorHeap::CPUHandle& colorRenderTargetView,
const GrD3DDescriptorHeap::CPUHandle& resolveRenderTargetView,
- GrMipMapsStatus,
+ GrMipmapStatus,
GrWrapCacheable);
// non-MSAA, wrapped
@@ -97,7 +97,7 @@
sk_sp<GrD3DResourceState> state,
const GrD3DDescriptorHeap::CPUHandle& shaderResourceView,
const GrD3DDescriptorHeap::CPUHandle& renderTargetView,
- GrMipMapsStatus,
+ GrMipmapStatus,
GrWrapCacheable);
// GrGLRenderTarget accounts for the texture's memory and any MSAA renderbuffer's memory.
diff --git a/src/gpu/dawn/GrDawnGpu.cpp b/src/gpu/dawn/GrDawnGpu.cpp
index b839281..1e5288f 100644
--- a/src/gpu/dawn/GrDawnGpu.cpp
+++ b/src/gpu/dawn/GrDawnGpu.cpp
@@ -203,11 +203,11 @@
return nullptr;
}
- GrMipMapsStatus mipMapsStatus =
- mipLevelCount > 1 ? GrMipMapsStatus::kDirty : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus =
+ mipLevelCount > 1 ? GrMipmapStatus::kDirty : GrMipmapStatus::kNotAllocated;
return GrDawnTexture::Make(this, dimensions, format, renderable, renderTargetSampleCnt,
- budgeted, mipLevelCount, mipMapsStatus);
+ budgeted, mipLevelCount, mipmapStatus);
}
sk_sp<GrTexture> GrDawnGpu::onCreateCompressedTexture(SkISize dimensions, const GrBackendFormat&,
@@ -227,7 +227,7 @@
}
SkISize dimensions = { backendTex.width(), backendTex.height() };
- GrMipMapsStatus status = GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus status = GrMipmapStatus::kNotAllocated;
return GrDawnTexture::MakeWrapped(this, dimensions, GrRenderable::kNo, 1, status, cacheable,
ioType, info);
}
@@ -253,7 +253,7 @@
return nullptr;
}
- GrMipMapsStatus status = GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus status = GrMipmapStatus::kNotAllocated;
return GrDawnTexture::MakeWrapped(this, dimensions, GrRenderable::kYes, sampleCnt, status,
cacheable, kRW_GrIOType, info);
}
diff --git a/src/gpu/dawn/GrDawnTexture.cpp b/src/gpu/dawn/GrDawnTexture.cpp
index 53f0655..a9cc2f7 100644
--- a/src/gpu/dawn/GrDawnTexture.cpp
+++ b/src/gpu/dawn/GrDawnTexture.cpp
@@ -16,9 +16,9 @@
SkISize dimensions,
wgpu::TextureView textureView,
const GrDawnTextureInfo& info,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, GrProtected::kNo)
- , GrTexture(gpu, dimensions, GrProtected::kNo, GrTextureType::k2D, mipMapsStatus)
+ , GrTexture(gpu, dimensions, GrProtected::kNo, GrTextureType::k2D, mipmapStatus)
, fInfo(info)
, fTextureView(textureView) {}
@@ -26,7 +26,7 @@
wgpu::TextureFormat format,
GrRenderable renderable, int sampleCnt,
SkBudgeted budgeted, int mipLevels,
- GrMipMapsStatus status) {
+ GrMipmapStatus status) {
bool renderTarget = renderable == GrRenderable::kYes;
wgpu::TextureDescriptor textureDesc;
@@ -84,7 +84,7 @@
sk_sp<GrDawnTexture> GrDawnTexture::MakeWrapped(GrDawnGpu* gpu, SkISize dimensions,
GrRenderable renderable,
- int sampleCnt, GrMipMapsStatus status,
+ int sampleCnt, GrMipmapStatus status,
GrWrapCacheable cacheable,
GrIOType ioType,
const GrDawnTextureInfo& info) {
diff --git a/src/gpu/dawn/GrDawnTexture.h b/src/gpu/dawn/GrDawnTexture.h
index 8fe344c..7e0666a 100644
--- a/src/gpu/dawn/GrDawnTexture.h
+++ b/src/gpu/dawn/GrDawnTexture.h
@@ -17,11 +17,11 @@
public:
static sk_sp<GrDawnTexture> Make(GrDawnGpu*, SkISize dimensions,
wgpu::TextureFormat format, GrRenderable, int sampleCnt,
- SkBudgeted, int mipLevels, GrMipMapsStatus);
+ SkBudgeted, int mipLevels, GrMipmapStatus);
static sk_sp<GrDawnTexture> MakeWrapped(GrDawnGpu*, SkISize dimensions,
GrRenderable, int sampleCnt,
- GrMipMapsStatus, GrWrapCacheable, GrIOType,
+ GrMipmapStatus, GrWrapCacheable, GrIOType,
const GrDawnTextureInfo&);
~GrDawnTexture() override;
@@ -40,7 +40,7 @@
wgpu::TextureView textureView() const { return fTextureView; }
protected:
GrDawnTexture(GrDawnGpu*, SkISize dimensions, wgpu::TextureView,
- const GrDawnTextureInfo&, GrMipMapsStatus);
+ const GrDawnTextureInfo&, GrMipmapStatus);
GrDawnGpu* getDawnGpu() const;
diff --git a/src/gpu/dawn/GrDawnTextureRenderTarget.cpp b/src/gpu/dawn/GrDawnTextureRenderTarget.cpp
index 84cac2d..dedb22f 100644
--- a/src/gpu/dawn/GrDawnTextureRenderTarget.cpp
+++ b/src/gpu/dawn/GrDawnTextureRenderTarget.cpp
@@ -16,9 +16,9 @@
wgpu::TextureView textureView,
int sampleCnt,
const GrDawnTextureInfo& textureInfo,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, GrProtected::kNo)
- , GrDawnTexture(gpu, dimensions, textureView, textureInfo, mipMapsStatus)
+ , GrDawnTexture(gpu, dimensions, textureView, textureInfo, mipmapStatus)
, GrDawnRenderTarget(gpu, dimensions, sampleCnt,
GrDawnRenderTargetInfo(textureInfo)) {}
diff --git a/src/gpu/dawn/GrDawnTextureRenderTarget.h b/src/gpu/dawn/GrDawnTextureRenderTarget.h
index d96e11d..9cf6fd7 100644
--- a/src/gpu/dawn/GrDawnTextureRenderTarget.h
+++ b/src/gpu/dawn/GrDawnTextureRenderTarget.h
@@ -26,7 +26,7 @@
const wgpu::TextureView textureView,
int sampleCnt,
const GrDawnTextureInfo& textureInfo,
- GrMipMapsStatus mipMapsStatus);
+ GrMipmapStatus mipmapStatus);
bool canAttemptStencilAttachment() const override;
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 8a9d74a..36e3bf1 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -647,10 +647,10 @@
desc.fOwnership = GrBackendObjectOwnership::kOwned;
}
- GrMipMapsStatus mipMapsStatus = backendTex.hasMipMaps() ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = backendTex.hasMipMaps() ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
- auto texture = GrGLTexture::MakeWrapped(this, mipMapsStatus, desc,
+ auto texture = GrGLTexture::MakeWrapped(this, mipmapStatus, desc,
backendTex.getGLTextureParams(), cacheable, ioType);
// We don't know what parameters are already set on wrapped textures.
texture->textureParamsModified();
@@ -699,10 +699,10 @@
desc.fOwnership = GrBackendObjectOwnership::kOwned;
}
- GrMipMapsStatus mipMapsStatus = backendTex.hasMipMaps() ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = backendTex.hasMipMaps() ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
- auto texture = GrGLTexture::MakeWrapped(this, mipMapsStatus, desc,
+ auto texture = GrGLTexture::MakeWrapped(this, mipmapStatus, desc,
backendTex.getGLTextureParams(), cacheable,
kRead_GrIOType);
// We don't know what parameters are already set on wrapped textures.
@@ -743,12 +743,12 @@
return nullptr;
}
- GrMipMapsStatus mipMapsStatus = backendTex.hasMipMaps() ? GrMipMapsStatus::kDirty
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = backendTex.hasMipMaps() ? GrMipmapStatus::kDirty
+ : GrMipmapStatus::kNotAllocated;
sk_sp<GrGLTextureRenderTarget> texRT(GrGLTextureRenderTarget::MakeWrapped(
this, sampleCnt, desc, backendTex.getGLTextureParams(), rtIDs, cacheable,
- mipMapsStatus));
+ mipmapStatus));
texRT->baseLevelWasBoundToFBO();
// We don't know what parameters are already set on wrapped textures.
texRT->textureParamsModified();
@@ -1274,8 +1274,8 @@
SkASSERT(GrGLCaps::kNone_MSFBOType != this->glCaps().msFBOType() || renderTargetSampleCnt == 1);
SkASSERT(mipLevelCount > 0);
- GrMipMapsStatus mipMapsStatus =
- mipLevelCount > 1 ? GrMipMapsStatus::kDirty : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus =
+ mipLevelCount > 1 ? GrMipmapStatus::kDirty : GrMipmapStatus::kNotAllocated;
GrGLTextureParameters::SamplerOverriddenState initialState;
GrGLTexture::Desc texDesc;
texDesc.fSize = dimensions;
@@ -1316,10 +1316,10 @@
return return_null_texture();
}
tex = sk_make_sp<GrGLTextureRenderTarget>(
- this, budgeted, renderTargetSampleCnt, texDesc, rtIDDesc, mipMapsStatus);
+ this, budgeted, renderTargetSampleCnt, texDesc, rtIDDesc, mipmapStatus);
tex->baseLevelWasBoundToFBO();
} else {
- tex = sk_make_sp<GrGLTexture>(this, budgeted, texDesc, mipMapsStatus);
+ tex = sk_make_sp<GrGLTexture>(this, budgeted, texDesc, mipmapStatus);
}
// The non-sampler params are still at their default values.
tex->parameters()->set(&initialState, GrGLTextureParameters::NonsamplerState(),
@@ -1396,11 +1396,11 @@
// Unbind this texture from the scratch texture unit.
this->bindTextureToScratchUnit(GR_GL_TEXTURE_2D, 0);
- GrMipMapsStatus mipMapsStatus = mipMapped == GrMipmapped::kYes
- ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = mipMapped == GrMipmapped::kYes
+ ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
- auto tex = sk_make_sp<GrGLTexture>(this, budgeted, desc, mipMapsStatus);
+ auto tex = sk_make_sp<GrGLTexture>(this, budgeted, desc, mipmapStatus);
// The non-sampler params are still at their default values.
tex->parameters()->set(&initialState, GrGLTextureParameters::NonsamplerState(),
fResetTimestampForTextureParameters);
diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp
index 2ab82a9..67057e3 100644
--- a/src/gpu/gl/GrGLTexture.cpp
+++ b/src/gpu/gl/GrGLTexture.cpp
@@ -43,10 +43,10 @@
// Because this class is virtually derived from GrSurface we must explicitly call its constructor.
GrGLTexture::GrGLTexture(GrGLGpu* gpu, SkBudgeted budgeted, const Desc& desc,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, desc.fSize, GrProtected::kNo)
, INHERITED(gpu, desc.fSize, GrProtected::kNo,
- TextureTypeFromTarget(desc.fTarget), mipMapsStatus)
+ TextureTypeFromTarget(desc.fTarget), mipmapStatus)
, fParameters(sk_make_sp<GrGLTextureParameters>()) {
this->init(desc);
this->registerWithCache(budgeted);
@@ -55,12 +55,12 @@
}
}
-GrGLTexture::GrGLTexture(GrGLGpu* gpu, const Desc& desc, GrMipMapsStatus mipMapsStatus,
+GrGLTexture::GrGLTexture(GrGLGpu* gpu, const Desc& desc, GrMipmapStatus mipmapStatus,
sk_sp<GrGLTextureParameters> parameters, GrWrapCacheable cacheable,
GrIOType ioType)
: GrSurface(gpu, desc.fSize, GrProtected::kNo)
, INHERITED(gpu, desc.fSize, GrProtected::kNo,
- TextureTypeFromTarget(desc.fTarget), mipMapsStatus)
+ TextureTypeFromTarget(desc.fTarget), mipmapStatus)
, fParameters(std::move(parameters)) {
SkASSERT(fParameters);
this->init(desc);
@@ -71,10 +71,10 @@
}
GrGLTexture::GrGLTexture(GrGLGpu* gpu, const Desc& desc, sk_sp<GrGLTextureParameters> parameters,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, desc.fSize, GrProtected::kNo)
, INHERITED(gpu, desc.fSize, GrProtected::kNo,
- TextureTypeFromTarget(desc.fTarget), mipMapsStatus) {
+ TextureTypeFromTarget(desc.fTarget), mipmapStatus) {
SkASSERT(parameters || desc.fOwnership == GrBackendObjectOwnership::kOwned);
fParameters = parameters ? std::move(parameters) : sk_make_sp<GrGLTextureParameters>();
this->init(desc);
@@ -124,13 +124,13 @@
}
sk_sp<GrGLTexture> GrGLTexture::MakeWrapped(GrGLGpu* gpu,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
const Desc& desc,
sk_sp<GrGLTextureParameters> parameters,
GrWrapCacheable cacheable,
GrIOType ioType) {
return sk_sp<GrGLTexture>(
- new GrGLTexture(gpu, desc, mipMapsStatus, std::move(parameters), cacheable, ioType));
+ new GrGLTexture(gpu, desc, mipmapStatus, std::move(parameters), cacheable, ioType));
}
bool GrGLTexture::onStealBackendTexture(GrBackendTexture* backendTexture,
diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h
index f22704c..982c0b6 100644
--- a/src/gpu/gl/GrGLTexture.h
+++ b/src/gpu/gl/GrGLTexture.h
@@ -28,7 +28,7 @@
static GrTextureType TextureTypeFromTarget(GrGLenum textureTarget);
- GrGLTexture(GrGLGpu*, SkBudgeted, const Desc&, GrMipMapsStatus);
+ GrGLTexture(GrGLGpu*, SkBudgeted, const Desc&, GrMipmapStatus);
~GrGLTexture() override {}
@@ -51,7 +51,7 @@
void baseLevelWasBoundToFBO() { fBaseLevelHasBeenBoundToFBO = true; }
static sk_sp<GrGLTexture> MakeWrapped(GrGLGpu*,
- GrMipMapsStatus,
+ GrMipmapStatus,
const Desc&,
sk_sp<GrGLTextureParameters>,
GrWrapCacheable, GrIOType);
@@ -60,12 +60,12 @@
protected:
// Constructor for subclasses.
- GrGLTexture(GrGLGpu*, const Desc&, sk_sp<GrGLTextureParameters>, GrMipMapsStatus);
+ GrGLTexture(GrGLGpu*, const Desc&, sk_sp<GrGLTextureParameters>, GrMipmapStatus);
// Constructor for instances wrapping backend objects.
GrGLTexture(GrGLGpu*,
const Desc&,
- GrMipMapsStatus,
+ GrMipmapStatus,
sk_sp<GrGLTextureParameters>,
GrWrapCacheable,
GrIOType);
diff --git a/src/gpu/gl/GrGLTextureRenderTarget.cpp b/src/gpu/gl/GrGLTextureRenderTarget.cpp
index 2747f29..90a58d0 100644
--- a/src/gpu/gl/GrGLTextureRenderTarget.cpp
+++ b/src/gpu/gl/GrGLTextureRenderTarget.cpp
@@ -17,9 +17,9 @@
int sampleCount,
const GrGLTexture::Desc& texDesc,
const GrGLRenderTarget::IDs& rtIDs,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, texDesc.fSize, GrProtected::kNo)
- , GrGLTexture(gpu, texDesc, nullptr, mipMapsStatus)
+ , GrGLTexture(gpu, texDesc, nullptr, mipmapStatus)
, GrGLRenderTarget(gpu, texDesc.fSize, texDesc.fFormat, sampleCount, rtIDs) {
this->registerWithCache(budgeted);
}
@@ -30,9 +30,9 @@
sk_sp<GrGLTextureParameters> parameters,
const GrGLRenderTarget::IDs& rtIDs,
GrWrapCacheable cacheable,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, texDesc.fSize, GrProtected::kNo)
- , GrGLTexture(gpu, texDesc, std::move(parameters), mipMapsStatus)
+ , GrGLTexture(gpu, texDesc, std::move(parameters), mipmapStatus)
, GrGLRenderTarget(gpu, texDesc.fSize, texDesc.fFormat, sampleCount,
rtIDs) {
this->registerWithCacheWrapped(cacheable);
@@ -65,9 +65,9 @@
sk_sp<GrGLTextureParameters> parameters,
const GrGLRenderTarget::IDs& rtIDs,
GrWrapCacheable cacheable,
- GrMipMapsStatus mipMapsStatus) {
+ GrMipmapStatus mipmapStatus) {
return sk_sp<GrGLTextureRenderTarget>(new GrGLTextureRenderTarget(
- gpu, sampleCount, texDesc, std::move(parameters), rtIDs, cacheable, mipMapsStatus));
+ gpu, sampleCount, texDesc, std::move(parameters), rtIDs, cacheable, mipmapStatus));
}
size_t GrGLTextureRenderTarget::onGpuMemorySize() const {
diff --git a/src/gpu/gl/GrGLTextureRenderTarget.h b/src/gpu/gl/GrGLTextureRenderTarget.h
index 96f1fef..f109aad 100644
--- a/src/gpu/gl/GrGLTextureRenderTarget.h
+++ b/src/gpu/gl/GrGLTextureRenderTarget.h
@@ -29,7 +29,7 @@
int sampleCount,
const GrGLTexture::Desc& texDesc,
const GrGLRenderTarget::IDs&,
- GrMipMapsStatus);
+ GrMipmapStatus);
bool canAttemptStencilAttachment() const override;
@@ -41,7 +41,7 @@
sk_sp<GrGLTextureParameters>,
const GrGLRenderTarget::IDs&,
GrWrapCacheable,
- GrMipMapsStatus);
+ GrMipmapStatus);
GrBackendFormat backendFormat() const override {
// It doesn't matter if we take the texture or render target path, so just pick texture.
@@ -67,7 +67,7 @@
sk_sp<GrGLTextureParameters> parameters,
const GrGLRenderTarget::IDs& ids,
GrWrapCacheable,
- GrMipMapsStatus);
+ GrMipmapStatus);
size_t onGpuMemorySize() const override;
};
diff --git a/src/gpu/mock/GrMockGpu.cpp b/src/gpu/mock/GrMockGpu.cpp
index ecf542d..cba8d41 100644
--- a/src/gpu/mock/GrMockGpu.cpp
+++ b/src/gpu/mock/GrMockGpu.cpp
@@ -150,17 +150,17 @@
GrColorType ct = format.asMockColorType();
SkASSERT(ct != GrColorType::kUnknown);
- GrMipMapsStatus mipMapsStatus =
- mipLevelCount > 1 ? GrMipMapsStatus::kDirty : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus =
+ mipLevelCount > 1 ? GrMipmapStatus::kDirty : GrMipmapStatus::kNotAllocated;
GrMockTextureInfo texInfo(ct, SkImage::CompressionType::kNone, NextInternalTextureID());
if (renderable == GrRenderable::kYes) {
GrMockRenderTargetInfo rtInfo(ct, NextInternalRenderTargetID());
return sk_sp<GrTexture>(new GrMockTextureRenderTarget(this, budgeted, dimensions,
renderTargetSampleCnt, isProtected,
- mipMapsStatus, texInfo, rtInfo));
+ mipmapStatus, texInfo, rtInfo));
}
return sk_sp<GrTexture>(
- new GrMockTexture(this, budgeted, dimensions, isProtected, mipMapsStatus, texInfo));
+ new GrMockTexture(this, budgeted, dimensions, isProtected, mipmapStatus, texInfo));
}
// TODO: why no 'isProtected' ?!
@@ -180,15 +180,15 @@
SkASSERT(compression != SkImage::CompressionType::kNone);
#endif
- GrMipMapsStatus mipMapsStatus = (mipMapped == GrMipmapped::kYes)
- ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = (mipMapped == GrMipmapped::kYes)
+ ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
GrMockTextureInfo texInfo(GrColorType::kUnknown,
format.asMockCompressionType(),
NextInternalTextureID());
return sk_sp<GrTexture>(
- new GrMockTexture(this, budgeted, dimensions, isProtected, mipMapsStatus, texInfo));
+ new GrMockTexture(this, budgeted, dimensions, isProtected, mipmapStatus, texInfo));
}
sk_sp<GrTexture> GrMockGpu::onWrapBackendTexture(const GrBackendTexture& tex,
@@ -203,10 +203,10 @@
return nullptr;
}
- GrMipMapsStatus mipMapsStatus = tex.hasMipMaps() ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = tex.hasMipMaps() ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
auto isProtected = GrProtected(tex.isProtected());
- return sk_sp<GrTexture>(new GrMockTexture(this, tex.dimensions(), isProtected, mipMapsStatus,
+ return sk_sp<GrTexture>(new GrMockTexture(this, tex.dimensions(), isProtected, mipmapStatus,
texInfo, wrapType, ioType));
}
@@ -224,15 +224,15 @@
SkAssertResult(tex.getMockTextureInfo(&texInfo));
SkASSERT(texInfo.compressionType() == SkImage::CompressionType::kNone);
- GrMipMapsStatus mipMapsStatus =
- tex.hasMipMaps() ? GrMipMapsStatus::kValid : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus =
+ tex.hasMipMaps() ? GrMipmapStatus::kValid : GrMipmapStatus::kNotAllocated;
// The client gave us the texture ID but we supply the render target ID.
GrMockRenderTargetInfo rtInfo(texInfo.colorType(), NextInternalRenderTargetID());
auto isProtected = GrProtected(tex.isProtected());
return sk_sp<GrTexture>(new GrMockTextureRenderTarget(this, tex.dimensions(), sampleCnt,
- isProtected, mipMapsStatus, texInfo,
+ isProtected, mipmapStatus, texInfo,
rtInfo, cacheable));
}
diff --git a/src/gpu/mock/GrMockTexture.h b/src/gpu/mock/GrMockTexture.h
index 2e883d3..851828b 100644
--- a/src/gpu/mock/GrMockTexture.h
+++ b/src/gpu/mock/GrMockTexture.h
@@ -21,20 +21,20 @@
SkBudgeted budgeted,
SkISize dimensions,
GrProtected isProtected,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
const GrMockTextureInfo& info)
- : GrMockTexture(gpu, dimensions, isProtected, mipMapsStatus, info) {
+ : GrMockTexture(gpu, dimensions, isProtected, mipmapStatus, info) {
this->registerWithCache(budgeted);
}
GrMockTexture(GrMockGpu* gpu,
SkISize dimensions,
GrProtected isProtected,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
const GrMockTextureInfo& info,
GrWrapCacheable cacheable,
GrIOType ioType)
- : GrMockTexture(gpu, dimensions, isProtected, mipMapsStatus, info) {
+ : GrMockTexture(gpu, dimensions, isProtected, mipmapStatus, info) {
if (ioType == kRead_GrIOType) {
this->setReadOnly();
}
@@ -57,9 +57,9 @@
protected:
// constructor for subclasses
GrMockTexture(GrMockGpu* gpu, const SkISize& dimensions, GrProtected isProtected,
- GrMipMapsStatus mipMapsStatus, const GrMockTextureInfo& info)
+ GrMipmapStatus mipmapStatus, const GrMockTextureInfo& info)
: GrSurface(gpu, dimensions, isProtected)
- , INHERITED(gpu, dimensions, isProtected, GrTextureType::k2D, mipMapsStatus)
+ , INHERITED(gpu, dimensions, isProtected, GrTextureType::k2D, mipmapStatus)
, fInfo(info) {}
void onRelease() override {
@@ -154,11 +154,11 @@
SkISize dimensions,
int sampleCnt,
GrProtected isProtected,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
const GrMockTextureInfo& texInfo,
const GrMockRenderTargetInfo& rtInfo)
: GrSurface(gpu, dimensions, isProtected)
- , GrMockTexture(gpu, dimensions, isProtected, mipMapsStatus, texInfo)
+ , GrMockTexture(gpu, dimensions, isProtected, mipmapStatus, texInfo)
, GrMockRenderTarget(gpu, dimensions, sampleCnt, isProtected, rtInfo) {
this->registerWithCache(budgeted);
}
@@ -168,12 +168,12 @@
SkISize dimensions,
int sampleCnt,
GrProtected isProtected,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
const GrMockTextureInfo& texInfo,
const GrMockRenderTargetInfo& rtInfo,
GrWrapCacheable cacheable)
: GrSurface(gpu, dimensions, isProtected)
- , GrMockTexture(gpu, dimensions, isProtected, mipMapsStatus, texInfo)
+ , GrMockTexture(gpu, dimensions, isProtected, mipmapStatus, texInfo)
, GrMockRenderTarget(gpu, dimensions, sampleCnt, isProtected, rtInfo) {
this->registerWithCacheWrapped(cacheable);
}
diff --git a/src/gpu/mtl/GrMtlGpu.mm b/src/gpu/mtl/GrMtlGpu.mm
index 2582ce4..8bcd6a7 100644
--- a/src/gpu/mtl/GrMtlGpu.mm
+++ b/src/gpu/mtl/GrMtlGpu.mm
@@ -467,13 +467,13 @@
texDesc.usage |= (renderable == GrRenderable::kYes) ? MTLTextureUsageRenderTarget : 0;
}
- GrMipMapsStatus mipMapsStatus =
- mipLevelCount > 1 ? GrMipMapsStatus::kDirty : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus =
+ mipLevelCount > 1 ? GrMipmapStatus::kDirty : GrMipmapStatus::kNotAllocated;
if (renderable == GrRenderable::kYes) {
tex = GrMtlTextureRenderTarget::MakeNewTextureRenderTarget(
- this, budgeted, dimensions, renderTargetSampleCnt, texDesc, mipMapsStatus);
+ this, budgeted, dimensions, renderTargetSampleCnt, texDesc, mipmapStatus);
} else {
- tex = GrMtlTexture::MakeNewTexture(this, budgeted, dimensions, texDesc, mipMapsStatus);
+ tex = GrMtlTexture::MakeNewTexture(this, budgeted, dimensions, texDesc, mipmapStatus);
}
if (!tex) {
@@ -534,11 +534,11 @@
texDesc.usage = MTLTextureUsageShaderRead;
}
- GrMipMapsStatus mipMapsStatus = (mipMapped == GrMipmapped::kYes)
- ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = (mipMapped == GrMipmapped::kYes)
+ ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
- auto tex = GrMtlTexture::MakeNewTexture(this, budgeted, dimensions, texDesc, mipMapsStatus);
+ auto tex = GrMtlTexture::MakeNewTexture(this, budgeted, dimensions, texDesc, mipmapStatus);
if (!tex) {
return nullptr;
}
diff --git a/src/gpu/mtl/GrMtlTexture.h b/src/gpu/mtl/GrMtlTexture.h
index 6cb8ec8..e13390f 100644
--- a/src/gpu/mtl/GrMtlTexture.h
+++ b/src/gpu/mtl/GrMtlTexture.h
@@ -20,7 +20,7 @@
SkBudgeted budgeted,
SkISize,
MTLTextureDescriptor*,
- GrMipMapsStatus);
+ GrMipmapStatus);
static sk_sp<GrMtlTexture> MakeWrappedTexture(GrMtlGpu*,
SkISize,
@@ -41,7 +41,7 @@
bool reallocForMipmap(GrMtlGpu* gpu, uint32_t mipLevels);
protected:
- GrMtlTexture(GrMtlGpu*, SkISize, id<MTLTexture>, GrMipMapsStatus);
+ GrMtlTexture(GrMtlGpu*, SkISize, id<MTLTexture>, GrMipmapStatus);
GrMtlGpu* getMtlGpu() const;
@@ -61,13 +61,13 @@
private:
enum Wrapped { kWrapped };
- GrMtlTexture(GrMtlGpu*, SkBudgeted, SkISize, id<MTLTexture>, GrMipMapsStatus);
+ GrMtlTexture(GrMtlGpu*, SkBudgeted, SkISize, id<MTLTexture>, GrMipmapStatus);
GrMtlTexture(GrMtlGpu*,
Wrapped,
SkISize,
id<MTLTexture>,
- GrMipMapsStatus,
+ GrMipmapStatus,
GrWrapCacheable,
GrIOType);
diff --git a/src/gpu/mtl/GrMtlTexture.mm b/src/gpu/mtl/GrMtlTexture.mm
index 9e096fa..be1d43c 100644
--- a/src/gpu/mtl/GrMtlTexture.mm
+++ b/src/gpu/mtl/GrMtlTexture.mm
@@ -19,11 +19,11 @@
SkBudgeted budgeted,
SkISize dimensions,
id<MTLTexture> texture,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, GrProtected::kNo)
- , INHERITED(gpu, dimensions, GrProtected::kNo, GrTextureType::k2D, mipMapsStatus)
+ , INHERITED(gpu, dimensions, GrProtected::kNo, GrTextureType::k2D, mipmapStatus)
, fTexture(texture) {
- SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == texture.mipmapLevelCount));
+ SkASSERT((GrMipmapStatus::kNotAllocated == mipmapStatus) == (1 == texture.mipmapLevelCount));
if (@available(macOS 10.11, iOS 9.0, *)) {
SkASSERT(SkToBool(texture.usage & MTLTextureUsageShaderRead));
}
@@ -38,13 +38,13 @@
Wrapped,
SkISize dimensions,
id<MTLTexture> texture,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
GrWrapCacheable cacheable,
GrIOType ioType)
: GrSurface(gpu, dimensions, GrProtected::kNo)
- , INHERITED(gpu, dimensions, GrProtected::kNo, GrTextureType::k2D, mipMapsStatus)
+ , INHERITED(gpu, dimensions, GrProtected::kNo, GrTextureType::k2D, mipmapStatus)
, fTexture(texture) {
- SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == texture.mipmapLevelCount));
+ SkASSERT((GrMipmapStatus::kNotAllocated == mipmapStatus) == (1 == texture.mipmapLevelCount));
if (@available(macOS 10.11, iOS 9.0, *)) {
SkASSERT(SkToBool(texture.usage & MTLTextureUsageShaderRead));
}
@@ -58,11 +58,11 @@
GrMtlTexture::GrMtlTexture(GrMtlGpu* gpu,
SkISize dimensions,
id<MTLTexture> texture,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, GrProtected::kNo)
- , INHERITED(gpu, dimensions, GrProtected::kNo, GrTextureType::k2D, mipMapsStatus)
+ , INHERITED(gpu, dimensions, GrProtected::kNo, GrTextureType::k2D, mipmapStatus)
, fTexture(texture) {
- SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == texture.mipmapLevelCount));
+ SkASSERT((GrMipmapStatus::kNotAllocated == mipmapStatus) == (1 == texture.mipmapLevelCount));
if (@available(macOS 10.11, iOS 9.0, *)) {
SkASSERT(SkToBool(texture.usage & MTLTextureUsageShaderRead));
}
@@ -73,7 +73,7 @@
SkBudgeted budgeted,
SkISize dimensions,
MTLTextureDescriptor* texDesc,
- GrMipMapsStatus mipMapsStatus) {
+ GrMipmapStatus mipmapStatus) {
id<MTLTexture> texture = [gpu->device() newTextureWithDescriptor:texDesc];
if (!texture) {
return nullptr;
@@ -81,7 +81,7 @@
if (@available(macOS 10.11, iOS 9.0, *)) {
SkASSERT(SkToBool(texture.usage & MTLTextureUsageShaderRead));
}
- return sk_sp<GrMtlTexture>(new GrMtlTexture(gpu, budgeted, dimensions, texture, mipMapsStatus));
+ return sk_sp<GrMtlTexture>(new GrMtlTexture(gpu, budgeted, dimensions, texture, mipmapStatus));
}
sk_sp<GrMtlTexture> GrMtlTexture::MakeWrappedTexture(GrMtlGpu* gpu,
@@ -93,10 +93,10 @@
if (@available(macOS 10.11, iOS 9.0, *)) {
SkASSERT(SkToBool(texture.usage & MTLTextureUsageShaderRead));
}
- GrMipMapsStatus mipMapsStatus = texture.mipmapLevelCount > 1 ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = texture.mipmapLevelCount > 1 ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
return sk_sp<GrMtlTexture>(
- new GrMtlTexture(gpu, kWrapped, dimensions, texture, mipMapsStatus, cacheable, ioType));
+ new GrMtlTexture(gpu, kWrapped, dimensions, texture, mipmapStatus, cacheable, ioType));
}
GrMtlTexture::~GrMtlTexture() {
diff --git a/src/gpu/mtl/GrMtlTextureRenderTarget.h b/src/gpu/mtl/GrMtlTextureRenderTarget.h
index ae6b494..79024a0 100644
--- a/src/gpu/mtl/GrMtlTextureRenderTarget.h
+++ b/src/gpu/mtl/GrMtlTextureRenderTarget.h
@@ -18,7 +18,7 @@
SkISize,
int sampleCnt,
MTLTextureDescriptor*,
- GrMipMapsStatus);
+ GrMipmapStatus);
static sk_sp<GrMtlTextureRenderTarget> MakeWrappedTextureRenderTarget(GrMtlGpu*,
SkISize,
@@ -47,26 +47,26 @@
int sampleCnt,
id<MTLTexture> colorTexture,
id<MTLTexture> resolveTexture,
- GrMipMapsStatus);
+ GrMipmapStatus);
GrMtlTextureRenderTarget(GrMtlGpu* gpu,
SkBudgeted budgeted,
SkISize,
id<MTLTexture> colorTexture,
- GrMipMapsStatus);
+ GrMipmapStatus);
GrMtlTextureRenderTarget(GrMtlGpu* gpu,
SkISize,
int sampleCnt,
id<MTLTexture> colorTexture,
id<MTLTexture> resolveTexture,
- GrMipMapsStatus,
+ GrMipmapStatus,
GrWrapCacheable cacheable);
GrMtlTextureRenderTarget(GrMtlGpu* gpu,
SkISize,
id<MTLTexture> colorTexture,
- GrMipMapsStatus,
+ GrMipmapStatus,
GrWrapCacheable cacheable);
size_t onGpuMemorySize() const override {
diff --git a/src/gpu/mtl/GrMtlTextureRenderTarget.mm b/src/gpu/mtl/GrMtlTextureRenderTarget.mm
index 57f2b4b..7d1b148 100644
--- a/src/gpu/mtl/GrMtlTextureRenderTarget.mm
+++ b/src/gpu/mtl/GrMtlTextureRenderTarget.mm
@@ -19,9 +19,9 @@
int sampleCnt,
id<MTLTexture> colorTexture,
id<MTLTexture> resolveTexture,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, GrProtected::kNo)
- , GrMtlTexture(gpu, dimensions, resolveTexture, mipMapsStatus)
+ , GrMtlTexture(gpu, dimensions, resolveTexture, mipmapStatus)
, GrMtlRenderTarget(gpu, dimensions, sampleCnt, colorTexture, resolveTexture) {
this->registerWithCache(budgeted);
}
@@ -30,9 +30,9 @@
SkBudgeted budgeted,
SkISize dimensions,
id<MTLTexture> colorTexture,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, GrProtected::kNo)
- , GrMtlTexture(gpu, dimensions, colorTexture, mipMapsStatus)
+ , GrMtlTexture(gpu, dimensions, colorTexture, mipmapStatus)
, GrMtlRenderTarget(gpu, dimensions, colorTexture) {
this->registerWithCache(budgeted);
}
@@ -42,10 +42,10 @@
int sampleCnt,
id<MTLTexture> colorTexture,
id<MTLTexture> resolveTexture,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
GrWrapCacheable cacheable)
: GrSurface(gpu, dimensions, GrProtected::kNo)
- , GrMtlTexture(gpu, dimensions, resolveTexture, mipMapsStatus)
+ , GrMtlTexture(gpu, dimensions, resolveTexture, mipmapStatus)
, GrMtlRenderTarget(gpu, dimensions, sampleCnt, colorTexture, resolveTexture) {
this->registerWithCacheWrapped(cacheable);
}
@@ -53,10 +53,10 @@
GrMtlTextureRenderTarget::GrMtlTextureRenderTarget(GrMtlGpu* gpu,
SkISize dimensions,
id<MTLTexture> colorTexture,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
GrWrapCacheable cacheable)
: GrSurface(gpu, dimensions, GrProtected::kNo)
- , GrMtlTexture(gpu, dimensions, colorTexture, mipMapsStatus)
+ , GrMtlTexture(gpu, dimensions, colorTexture, mipmapStatus)
, GrMtlRenderTarget(gpu, dimensions, colorTexture) {
this->registerWithCacheWrapped(cacheable);
}
@@ -89,7 +89,7 @@
SkISize dimensions,
int sampleCnt,
MTLTextureDescriptor* texDesc,
- GrMipMapsStatus mipMapsStatus) {
+ GrMipmapStatus mipmapStatus) {
id<MTLTexture> texture = [gpu->device() newTextureWithDescriptor:texDesc];
if (!texture) {
return nullptr;
@@ -108,10 +108,10 @@
SkASSERT((MTLTextureUsageShaderRead|MTLTextureUsageRenderTarget) & colorTexture.usage);
}
return sk_sp<GrMtlTextureRenderTarget>(new GrMtlTextureRenderTarget(
- gpu, budgeted, dimensions, sampleCnt, colorTexture, texture, mipMapsStatus));
+ gpu, budgeted, dimensions, sampleCnt, colorTexture, texture, mipmapStatus));
} else {
return sk_sp<GrMtlTextureRenderTarget>(
- new GrMtlTextureRenderTarget(gpu, budgeted, dimensions, texture, mipMapsStatus));
+ new GrMtlTextureRenderTarget(gpu, budgeted, dimensions, texture, mipmapStatus));
}
}
@@ -125,9 +125,9 @@
if (@available(macOS 10.11, iOS 9.0, *)) {
SkASSERT((MTLTextureUsageShaderRead | MTLTextureUsageRenderTarget) & texture.usage);
}
- GrMipMapsStatus mipMapsStatus = texture.mipmapLevelCount > 1
- ? GrMipMapsStatus::kDirty
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = texture.mipmapLevelCount > 1
+ ? GrMipmapStatus::kDirty
+ : GrMipmapStatus::kNotAllocated;
if (sampleCnt > 1) {
id<MTLTexture> colorTexture =
create_msaa_texture(gpu, dimensions, texture.pixelFormat, sampleCnt);
@@ -138,9 +138,9 @@
SkASSERT((MTLTextureUsageShaderRead|MTLTextureUsageRenderTarget) & colorTexture.usage);
}
return sk_sp<GrMtlTextureRenderTarget>(new GrMtlTextureRenderTarget(
- gpu, dimensions, sampleCnt, colorTexture, texture, mipMapsStatus, cacheable));
+ gpu, dimensions, sampleCnt, colorTexture, texture, mipmapStatus, cacheable));
} else {
return sk_sp<GrMtlTextureRenderTarget>(
- new GrMtlTextureRenderTarget(gpu, dimensions, texture, mipMapsStatus, cacheable));
+ new GrMtlTextureRenderTarget(gpu, dimensions, texture, mipmapStatus, cacheable));
}
}
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index be84fcf..b6d7f53 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -888,7 +888,7 @@
imageDesc.fMemProps = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
copyTexture = GrVkTexture::MakeNewTexture(this, SkBudgeted::kYes, {width, height},
- imageDesc, GrMipMapsStatus::kNotAllocated);
+ imageDesc, GrMipmapStatus::kNotAllocated);
if (!copyTexture) {
return false;
}
@@ -1059,15 +1059,15 @@
imageDesc.fUsageFlags = usageFlags;
imageDesc.fIsProtected = isProtected;
- GrMipMapsStatus mipMapsStatus =
- mipLevelCount > 1 ? GrMipMapsStatus::kDirty : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus =
+ mipLevelCount > 1 ? GrMipmapStatus::kDirty : GrMipmapStatus::kNotAllocated;
sk_sp<GrVkTexture> tex;
if (renderable == GrRenderable::kYes) {
tex = GrVkTextureRenderTarget::MakeNewTextureRenderTarget(
- this, budgeted, dimensions, renderTargetSampleCnt, imageDesc, mipMapsStatus);
+ this, budgeted, dimensions, renderTargetSampleCnt, imageDesc, mipmapStatus);
} else {
- tex = GrVkTexture::MakeNewTexture(this, budgeted, dimensions, imageDesc, mipMapsStatus);
+ tex = GrVkTexture::MakeNewTexture(this, budgeted, dimensions, imageDesc, mipmapStatus);
}
if (!tex) {
@@ -1144,11 +1144,10 @@
imageDesc.fUsageFlags = usageFlags;
imageDesc.fIsProtected = isProtected;
- GrMipMapsStatus mipMapsStatus = (mipMapped == GrMipmapped::kYes)
- ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = (mipMapped == GrMipmapped::kYes) ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
- auto tex = GrVkTexture::MakeNewTexture(this, budgeted, dimensions, imageDesc, mipMapsStatus);
+ auto tex = GrVkTexture::MakeNewTexture(this, budgeted, dimensions, imageDesc, mipmapStatus);
if (!tex) {
return nullptr;
}
@@ -2332,7 +2331,7 @@
copySurface = GrVkTextureRenderTarget::MakeNewTextureRenderTarget(
this, SkBudgeted::kYes, {width, height}, 1, imageDesc,
- GrMipMapsStatus::kNotAllocated);
+ GrMipmapStatus::kNotAllocated);
if (!copySurface) {
return false;
}
diff --git a/src/gpu/vk/GrVkTexture.cpp b/src/gpu/vk/GrVkTexture.cpp
index c930a28..101bb15 100644
--- a/src/gpu/vk/GrVkTexture.cpp
+++ b/src/gpu/vk/GrVkTexture.cpp
@@ -25,13 +25,13 @@
const GrVkImageInfo& info,
sk_sp<GrBackendSurfaceMutableStateImpl> mutableState,
const GrVkImageView* view,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, info.fProtected)
, GrVkImage(gpu, info, std::move(mutableState), GrBackendObjectOwnership::kOwned)
- , INHERITED(gpu, dimensions, info.fProtected, GrTextureType::k2D, mipMapsStatus)
+ , INHERITED(gpu, dimensions, info.fProtected, GrTextureType::k2D, mipmapStatus)
, fTextureView(view)
, fDescSetCache(kMaxCachedDescSets) {
- SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == info.fLevelCount));
+ SkASSERT((GrMipmapStatus::kNotAllocated == mipmapStatus) == (1 == info.fLevelCount));
// We don't support creating external GrVkTextures
SkASSERT(!info.fYcbcrConversionInfo.isValid() || !info.fYcbcrConversionInfo.fExternalFormat);
this->registerWithCache(budgeted);
@@ -43,15 +43,15 @@
GrVkTexture::GrVkTexture(GrVkGpu* gpu, SkISize dimensions, const GrVkImageInfo& info,
sk_sp<GrBackendSurfaceMutableStateImpl> mutableState,
const GrVkImageView* view,
- GrMipMapsStatus mipMapsStatus, GrBackendObjectOwnership ownership,
+ GrMipmapStatus mipmapStatus, GrBackendObjectOwnership ownership,
GrWrapCacheable cacheable, GrIOType ioType, bool isExternal)
: GrSurface(gpu, dimensions, info.fProtected)
, GrVkImage(gpu, info, std::move(mutableState), ownership)
, INHERITED(gpu, dimensions, info.fProtected,
- isExternal ? GrTextureType::kExternal : GrTextureType::k2D, mipMapsStatus)
+ isExternal ? GrTextureType::kExternal : GrTextureType::k2D, mipmapStatus)
, fTextureView(view)
, fDescSetCache(kMaxCachedDescSets) {
- SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == info.fLevelCount));
+ SkASSERT((GrMipmapStatus::kNotAllocated == mipmapStatus) == (1 == info.fLevelCount));
if (ioType == kRead_GrIOType) {
this->setReadOnly();
}
@@ -64,14 +64,14 @@
const GrVkImageInfo& info,
sk_sp<GrBackendSurfaceMutableStateImpl> mutableState,
const GrVkImageView* view,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
GrBackendObjectOwnership ownership)
: GrSurface(gpu, dimensions, info.fProtected)
, GrVkImage(gpu, info, std::move(mutableState), ownership)
- , INHERITED(gpu, dimensions, info.fProtected, GrTextureType::k2D, mipMapsStatus)
+ , INHERITED(gpu, dimensions, info.fProtected, GrTextureType::k2D, mipmapStatus)
, fTextureView(view)
, fDescSetCache(kMaxCachedDescSets) {
- SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == info.fLevelCount));
+ SkASSERT((GrMipmapStatus::kNotAllocated == mipmapStatus) == (1 == info.fLevelCount));
// Since this ctor is only called from GrVkTextureRenderTarget, we can't have a ycbcr conversion
// since we don't support that on render targets.
SkASSERT(!info.fYcbcrConversionInfo.isValid());
@@ -80,7 +80,7 @@
sk_sp<GrVkTexture> GrVkTexture::MakeNewTexture(GrVkGpu* gpu, SkBudgeted budgeted,
SkISize dimensions,
const GrVkImage::ImageDesc& imageDesc,
- GrMipMapsStatus mipMapsStatus) {
+ GrMipmapStatus mipmapStatus) {
SkASSERT(imageDesc.fUsageFlags & VK_IMAGE_USAGE_SAMPLED_BIT);
GrVkImageInfo info;
@@ -98,7 +98,7 @@
sk_sp<GrBackendSurfaceMutableStateImpl> mutableState(
new GrBackendSurfaceMutableStateImpl(info.fImageLayout, info.fCurrentQueueFamily));
return sk_sp<GrVkTexture>(new GrVkTexture(gpu, budgeted, dimensions, info,
- std::move(mutableState), imageView, mipMapsStatus));
+ std::move(mutableState), imageView, mipmapStatus));
}
sk_sp<GrVkTexture> GrVkTexture::MakeWrappedTexture(
@@ -116,15 +116,15 @@
return nullptr;
}
- GrMipMapsStatus mipMapsStatus = info.fLevelCount > 1 ? GrMipMapsStatus::kValid
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = info.fLevelCount > 1 ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
GrBackendObjectOwnership ownership = kBorrow_GrWrapOwnership == wrapOwnership
? GrBackendObjectOwnership::kBorrowed : GrBackendObjectOwnership::kOwned;
bool isExternal = info.fYcbcrConversionInfo.isValid() &&
(info.fYcbcrConversionInfo.fExternalFormat != 0);
return sk_sp<GrVkTexture>(new GrVkTexture(gpu, dimensions, info, std::move(mutableState),
- imageView, mipMapsStatus, ownership, cacheable,
+ imageView, mipmapStatus, ownership, cacheable,
ioType, isExternal));
}
diff --git a/src/gpu/vk/GrVkTexture.h b/src/gpu/vk/GrVkTexture.h
index a0a2ae0..b6e298f 100644
--- a/src/gpu/vk/GrVkTexture.h
+++ b/src/gpu/vk/GrVkTexture.h
@@ -25,7 +25,7 @@
SkBudgeted budgeted,
SkISize dimensions,
const GrVkImage::ImageDesc&,
- GrMipMapsStatus);
+ GrMipmapStatus);
static sk_sp<GrVkTexture> MakeWrappedTexture(GrVkGpu*,
SkISize dimensions,
@@ -63,7 +63,7 @@
const GrVkImageInfo&,
sk_sp<GrBackendSurfaceMutableStateImpl>,
const GrVkImageView*,
- GrMipMapsStatus,
+ GrMipmapStatus,
GrBackendObjectOwnership);
GrVkGpu* getVkGpu() const;
@@ -80,9 +80,9 @@
private:
GrVkTexture(GrVkGpu*, SkBudgeted, SkISize, const GrVkImageInfo&,
sk_sp<GrBackendSurfaceMutableStateImpl>, const GrVkImageView* imageView,
- GrMipMapsStatus);
+ GrMipmapStatus);
GrVkTexture(GrVkGpu*, SkISize, const GrVkImageInfo&, sk_sp<GrBackendSurfaceMutableStateImpl>,
- const GrVkImageView*, GrMipMapsStatus, GrBackendObjectOwnership, GrWrapCacheable,
+ const GrVkImageView*, GrMipmapStatus, GrBackendObjectOwnership, GrWrapCacheable,
GrIOType, bool isExternal);
// In Vulkan we call the release proc after we are finished with the underlying
diff --git a/src/gpu/vk/GrVkTextureRenderTarget.cpp b/src/gpu/vk/GrVkTextureRenderTarget.cpp
index 23b5613..82da3e0 100644
--- a/src/gpu/vk/GrVkTextureRenderTarget.cpp
+++ b/src/gpu/vk/GrVkTextureRenderTarget.cpp
@@ -30,10 +30,10 @@
sk_sp<GrBackendSurfaceMutableStateImpl> msaaMutableState,
const GrVkImageView* colorAttachmentView,
const GrVkImageView* resolveAttachmentView,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, info.fProtected)
, GrVkImage(gpu, info, mutableState, GrBackendObjectOwnership::kOwned)
- , GrVkTexture(gpu, dimensions, info, mutableState, texView, mipMapsStatus,
+ , GrVkTexture(gpu, dimensions, info, mutableState, texView, mipmapStatus,
GrBackendObjectOwnership::kOwned)
, GrVkRenderTarget(gpu, dimensions, sampleCnt, info, std::move(mutableState), msaaInfo,
std::move(msaaMutableState), colorAttachmentView, resolveAttachmentView,
@@ -50,10 +50,10 @@
sk_sp<GrBackendSurfaceMutableStateImpl> mutableState,
const GrVkImageView* texView,
const GrVkImageView* colorAttachmentView,
- GrMipMapsStatus mipMapsStatus)
+ GrMipmapStatus mipmapStatus)
: GrSurface(gpu, dimensions, info.fProtected)
, GrVkImage(gpu, info, mutableState, GrBackendObjectOwnership::kOwned)
- , GrVkTexture(gpu, dimensions, info, mutableState, texView, mipMapsStatus,
+ , GrVkTexture(gpu, dimensions, info, mutableState, texView, mipmapStatus,
GrBackendObjectOwnership::kOwned)
, GrVkRenderTarget(gpu, dimensions, info, std::move(mutableState), colorAttachmentView,
GrBackendObjectOwnership::kOwned) {
@@ -71,12 +71,12 @@
sk_sp<GrBackendSurfaceMutableStateImpl> msaaMutableState,
const GrVkImageView* colorAttachmentView,
const GrVkImageView* resolveAttachmentView,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
GrBackendObjectOwnership ownership,
GrWrapCacheable cacheable)
: GrSurface(gpu, dimensions, info.fProtected)
, GrVkImage(gpu, info, mutableState, ownership)
- , GrVkTexture(gpu, dimensions, info, mutableState, texView, mipMapsStatus, ownership)
+ , GrVkTexture(gpu, dimensions, info, mutableState, texView, mipmapStatus, ownership)
, GrVkRenderTarget(gpu, dimensions, sampleCnt, info, std::move(mutableState), msaaInfo,
std::move(msaaMutableState), colorAttachmentView, resolveAttachmentView,
ownership) {
@@ -91,12 +91,12 @@
sk_sp<GrBackendSurfaceMutableStateImpl> mutableState,
const GrVkImageView* texView,
const GrVkImageView* colorAttachmentView,
- GrMipMapsStatus mipMapsStatus,
+ GrMipmapStatus mipmapStatus,
GrBackendObjectOwnership ownership,
GrWrapCacheable cacheable)
: GrSurface(gpu, dimensions, info.fProtected)
, GrVkImage(gpu, info, mutableState, ownership)
- , GrVkTexture(gpu, dimensions, info, mutableState, texView, mipMapsStatus, ownership)
+ , GrVkTexture(gpu, dimensions, info, mutableState, texView, mipmapStatus, ownership)
, GrVkRenderTarget(gpu, dimensions, info, std::move(mutableState), colorAttachmentView,
ownership) {
this->registerWithCacheWrapped(cacheable);
@@ -185,7 +185,7 @@
SkISize dimensions,
int sampleCnt,
const GrVkImage::ImageDesc& imageDesc,
- GrMipMapsStatus mipMapsStatus) {
+ GrMipmapStatus mipmapStatus) {
SkASSERT(imageDesc.fUsageFlags & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
SkASSERT(imageDesc.fUsageFlags & VK_IMAGE_USAGE_SAMPLED_BIT);
@@ -205,11 +205,11 @@
return sk_sp<GrVkTextureRenderTarget>(new GrVkTextureRenderTarget(
gpu, budgeted, dimensions, sampleCnt, info, std::move(mutableState),
views.imageView, views.msInfo, std::move(views.msMutableState),
- views.colorAttachmentView, views.resolveAttachmentView, mipMapsStatus));
+ views.colorAttachmentView, views.resolveAttachmentView, mipmapStatus));
} else {
return sk_sp<GrVkTextureRenderTarget>(new GrVkTextureRenderTarget(
gpu, budgeted, dimensions, info, std::move(mutableState), views.imageView,
- views.colorAttachmentView, mipMapsStatus));
+ views.colorAttachmentView, mipmapStatus));
}
}
@@ -225,8 +225,8 @@
SkASSERT(VK_NULL_HANDLE != info.fImage &&
(kBorrow_GrWrapOwnership == wrapOwnership || VK_NULL_HANDLE != info.fAlloc.fMemory));
- GrMipMapsStatus mipMapsStatus = info.fLevelCount > 1 ? GrMipMapsStatus::kDirty
- : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = info.fLevelCount > 1 ? GrMipmapStatus::kDirty
+ : GrMipmapStatus::kNotAllocated;
GrBackendObjectOwnership ownership = kBorrow_GrWrapOwnership == wrapOwnership
? GrBackendObjectOwnership::kBorrowed : GrBackendObjectOwnership::kOwned;
@@ -238,11 +238,11 @@
return sk_sp<GrVkTextureRenderTarget>(new GrVkTextureRenderTarget(
gpu, dimensions, sampleCnt, info, std::move(mutableState), views.imageView,
views.msInfo, std::move(views.msMutableState), views.colorAttachmentView,
- views.resolveAttachmentView, mipMapsStatus, ownership, cacheable));
+ views.resolveAttachmentView, mipmapStatus, ownership, cacheable));
} else {
return sk_sp<GrVkTextureRenderTarget>(new GrVkTextureRenderTarget(
gpu, dimensions, info, std::move(mutableState), views.imageView,
- views.colorAttachmentView, mipMapsStatus, ownership, cacheable));
+ views.colorAttachmentView, mipmapStatus, ownership, cacheable));
}
}
diff --git a/src/gpu/vk/GrVkTextureRenderTarget.h b/src/gpu/vk/GrVkTextureRenderTarget.h
index adc352d..1d3a99e 100644
--- a/src/gpu/vk/GrVkTextureRenderTarget.h
+++ b/src/gpu/vk/GrVkTextureRenderTarget.h
@@ -30,7 +30,7 @@
SkISize dimensions,
int sampleCnt,
const GrVkImage::ImageDesc&,
- GrMipMapsStatus);
+ GrMipmapStatus);
static sk_sp<GrVkTextureRenderTarget> MakeWrappedTextureRenderTarget(
GrVkGpu*,
@@ -69,7 +69,7 @@
sk_sp<GrBackendSurfaceMutableStateImpl> msaaMutableState,
const GrVkImageView* colorAttachmentView,
const GrVkImageView* resolveAttachmentView,
- GrMipMapsStatus);
+ GrMipmapStatus);
// non-MSAA, not-wrapped
GrVkTextureRenderTarget(GrVkGpu* gpu,
@@ -79,7 +79,7 @@
sk_sp<GrBackendSurfaceMutableStateImpl> mutableState,
const GrVkImageView* texView,
const GrVkImageView* colorAttachmentView,
- GrMipMapsStatus);
+ GrMipmapStatus);
// MSAA, wrapped
GrVkTextureRenderTarget(GrVkGpu* gpu,
@@ -92,7 +92,7 @@
sk_sp<GrBackendSurfaceMutableStateImpl> msaaMutableState,
const GrVkImageView* colorAttachmentView,
const GrVkImageView* resolveAttachmentView,
- GrMipMapsStatus,
+ GrMipmapStatus,
GrBackendObjectOwnership,
GrWrapCacheable);
@@ -103,7 +103,7 @@
sk_sp<GrBackendSurfaceMutableStateImpl> mutableState,
const GrVkImageView* texView,
const GrVkImageView* colorAttachmentView,
- GrMipMapsStatus,
+ GrMipmapStatus,
GrBackendObjectOwnership,
GrWrapCacheable);
diff --git a/src/image/SkImage_GpuBase.cpp b/src/image/SkImage_GpuBase.cpp
index 0361a7a..51cf6fa 100644
--- a/src/image/SkImage_GpuBase.cpp
+++ b/src/image/SkImage_GpuBase.cpp
@@ -494,13 +494,13 @@
// 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::kValid : GrMipMapsStatus::kNotAllocated;
+ GrMipmapStatus mipmapStatus = (GrMipmapped::kYes == mipMapped) ? GrMipmapStatus::kValid
+ : GrMipmapStatus::kNotAllocated;
// We pass kReadOnly here since we should treat content of the client's texture as immutable.
// The promise API provides no way for the client to indicated that the texture is protected.
return proxyProvider->createLazyProxy(
std::move(callback), backendFormat, {width, height}, GrRenderable::kNo, 1, mipMapped,
- mipMapsStatus, GrInternalSurfaceFlags::kReadOnly, SkBackingFit::kExact, SkBudgeted::kNo,
+ mipmapStatus, GrInternalSurfaceFlags::kReadOnly, SkBackingFit::kExact, SkBudgeted::kNo,
GrProtected::kNo, GrSurfaceProxy::UseAllocator::kYes);
}
diff --git a/src/image/SkSurface_GpuMtl.mm b/src/image/SkSurface_GpuMtl.mm
index b095f56..ae30970 100644
--- a/src/image/SkSurface_GpuMtl.mm
+++ b/src/image/SkSurface_GpuMtl.mm
@@ -77,7 +77,7 @@
sampleCnt > 1 ? GrInternalSurfaceFlags::kRequiresManualMSAAResolve
: GrInternalSurfaceFlags::kNone,
metalLayer.framebufferOnly ? nullptr : &texInfo,
- GrMipMapsStatus::kNotAllocated,
+ GrMipmapStatus::kNotAllocated,
SkBackingFit::kExact,
SkBudgeted::kYes,
GrProtected::kNo,
@@ -147,7 +147,7 @@
sampleCnt > 1 ? GrInternalSurfaceFlags::kRequiresManualMSAAResolve
: GrInternalSurfaceFlags::kNone,
mtkView.framebufferOnly ? nullptr : &texInfo,
- GrMipMapsStatus::kNotAllocated,
+ GrMipmapStatus::kNotAllocated,
SkBackingFit::kExact,
SkBudgeted::kYes,
GrProtected::kNo,
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index 41d67ae..51687e7 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -569,7 +569,7 @@
}
auto proxy = dContext->priv().proxyProvider()->createLazyProxy(
singleUseLazyCB, backendFormat, desc, renderable, 1, GrMipmapped::kNo,
- GrMipMapsStatus::kNotAllocated, GrInternalSurfaceFlags ::kNone,
+ GrMipmapStatus::kNotAllocated, GrInternalSurfaceFlags ::kNone,
SkBackingFit::kExact, budgeted, GrProtected::kNo,
GrSurfaceProxy::UseAllocator::kYes);
GrSwizzle readSwizzle = dContext->priv().caps()->getReadSwizzle(
diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp
index cce8907..6cc6ea7 100644
--- a/tests/LazyProxyTest.cpp
+++ b/tests/LazyProxyTest.cpp
@@ -273,7 +273,7 @@
};
sk_sp<GrTextureProxy> proxy = proxyProvider->createLazyProxy(
TestCallback(&testCount, releaseCallback, tex), format, {kSize, kSize},
- GrRenderable::kNo, 1, GrMipmapped::kNo, GrMipMapsStatus::kNotAllocated,
+ GrRenderable::kNo, 1, GrMipmapped::kNo, GrMipmapStatus::kNotAllocated,
GrInternalSurfaceFlags::kNone, SkBackingFit::kExact, SkBudgeted::kNo,
GrProtected::kNo, GrSurfaceProxy::UseAllocator::kYes);
@@ -344,7 +344,7 @@
true, GrSurfaceProxy::LazyInstantiationKeyMode::kUnsynced};
},
format, dims, GrRenderable::kNo, 1, GrMipmapped::kNo,
- GrMipMapsStatus::kNotAllocated, GrInternalSurfaceFlags::kNone, SkBackingFit::kExact,
+ GrMipmapStatus::kNotAllocated, GrInternalSurfaceFlags::kNone, SkBackingFit::kExact,
SkBudgeted::kNo, GrProtected::kNo, GrSurfaceProxy::UseAllocator::kYes);
SkASSERT(fLazyProxy.get());
diff --git a/tests/ResourceAllocatorTest.cpp b/tests/ResourceAllocatorTest.cpp
index 39523fe..303ae46 100644
--- a/tests/ResourceAllocatorTest.cpp
+++ b/tests/ResourceAllocatorTest.cpp
@@ -276,7 +276,7 @@
GrInternalSurfaceFlags flags = GrInternalSurfaceFlags::kNone;
SkISize dims = {p.fSize, p.fSize};
return proxyProvider->createLazyProxy(callback, format, dims, p.fRenderable, p.fSampleCnt,
- GrMipmapped::kNo, GrMipMapsStatus::kNotAllocated, flags,
+ GrMipmapped::kNo, GrMipmapStatus::kNotAllocated, flags,
p.fFit, p.fBudgeted, GrProtected::kNo,
GrSurfaceProxy::UseAllocator::kYes);
}
diff --git a/tests/TraceMemoryDumpTest.cpp b/tests/TraceMemoryDumpTest.cpp
index d22c200..25dd44b 100644
--- a/tests/TraceMemoryDumpTest.cpp
+++ b/tests/TraceMemoryDumpTest.cpp
@@ -97,7 +97,7 @@
desc.fSize = SkISize::Make(64, 64);
auto texture =
- sk_make_sp<GrGLTexture>(gpu, SkBudgeted::kNo, desc, GrMipMapsStatus::kNotAllocated);
+ sk_make_sp<GrGLTexture>(gpu, SkBudgeted::kNo, desc, GrMipmapStatus::kNotAllocated);
ValidateMemoryDumps(reporter, context, texture->gpuMemorySize(), true /* isOwned */);
}
@@ -116,7 +116,7 @@
auto params = sk_make_sp<GrGLTextureParameters>();
auto texture =
- GrGLTexture::MakeWrapped(gpu, GrMipMapsStatus::kNotAllocated, desc, std::move(params),
+ GrGLTexture::MakeWrapped(gpu, GrMipmapStatus::kNotAllocated, desc, std::move(params),
GrWrapCacheable::kNo, kRead_GrIOType);
ValidateMemoryDumps(reporter, context, texture->gpuMemorySize(), false /* isOwned */);