Remove SkBudgeted in favor of skgpu::Budgeted
Apparently I missed some cases in our Objective C code.
All clients have been moved onto the new name.
Change-Id: I560acc40eddc17978e22072321f773f2e0c5255d
Bug: skia:13983
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/629456
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Owners-Override: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
diff --git a/include/gpu/GpuTypes.h b/include/gpu/GpuTypes.h
index da39a6a5..06db761 100644
--- a/include/gpu/GpuTypes.h
+++ b/include/gpu/GpuTypes.h
@@ -53,7 +53,5 @@
} // namespace skgpu
-// TODO(kjlubick, brianosman) Remove this typedef after clients are migrated off this name
-using SkBudgeted = skgpu::Budgeted;
#endif // skgpu_GpuTypes_DEFINED
diff --git a/site/docs/user/api/skcanvas_creation.md b/site/docs/user/api/skcanvas_creation.md
index 7ffcac1..34f9812 100644
--- a/site/docs/user/api/skcanvas_creation.md
+++ b/site/docs/user/api/skcanvas_creation.md
@@ -94,7 +94,7 @@
sk_sp<GrDirectContext> context = GrDirectContext::MakeGL(interface);
SkImageInfo info = SkImageInfo:: MakeN32Premul(width, height);
sk_sp<SkSurface> gpuSurface(
- SkSurface::MakeRenderTarget(context.get(), SkBudgeted::kNo, info));
+ SkSurface::MakeRenderTarget(context.get(), skgpu::Budgeted::kNo, info));
if (!gpuSurface) {
SkDebugf("SkSurface::MakeRenderTarget returned null\n");
return;
diff --git a/src/gpu/ganesh/mtl/GrMtlAttachment.mm b/src/gpu/ganesh/mtl/GrMtlAttachment.mm
index f1e1720..29384ab 100644
--- a/src/gpu/ganesh/mtl/GrMtlAttachment.mm
+++ b/src/gpu/ganesh/mtl/GrMtlAttachment.mm
@@ -22,7 +22,7 @@
SkISize dimensions,
UsageFlags supportedUsages,
id<MTLTexture> texture,
- SkBudgeted budgeted,
+ skgpu::Budgeted budgeted,
std::string_view label)
: GrAttachment(gpu, dimensions, supportedUsages, texture.sampleCount,
texture.mipmapLevelCount > 1 ? GrMipmapped::kYes : GrMipmapped::kNo,
@@ -55,7 +55,7 @@
storageMode = MTLStorageModePrivate;
}
return GrMtlAttachment::Make(gpu, dimensions, UsageFlags::kStencilAttachment, sampleCnt, format,
- /*mipLevels=*/1, textureUsage, storageMode, SkBudgeted::kYes);
+ /*mipLevels=*/1, textureUsage, storageMode, skgpu::Budgeted::kYes);
}
sk_sp<GrMtlAttachment> GrMtlAttachment::MakeMSAA(GrMtlGpu* gpu,
@@ -69,7 +69,7 @@
storageMode = MTLStorageModePrivate;
}
return GrMtlAttachment::Make(gpu, dimensions, UsageFlags::kColorAttachment, sampleCnt, format,
- /*mipLevels=*/1, textureUsage, storageMode, SkBudgeted::kYes);
+ /*mipLevels=*/1, textureUsage, storageMode, skgpu::Budgeted::kYes);
}
sk_sp<GrMtlAttachment> GrMtlAttachment::MakeTexture(GrMtlGpu* gpu,
@@ -78,7 +78,7 @@
uint32_t mipLevels,
GrRenderable renderable,
int numSamples,
- SkBudgeted budgeted) {
+ skgpu::Budgeted budgeted) {
int textureUsage = 0;
int storageMode = 0;
if (@available(macOS 10.11, iOS 9.0, *)) {
@@ -105,7 +105,7 @@
uint32_t mipLevels,
int mtlTextureUsage,
int mtlStorageMode,
- SkBudgeted budgeted) {
+ skgpu::Budgeted budgeted) {
auto desc = [[MTLTextureDescriptor alloc] init];
desc.textureType = (sampleCnt > 1) ? MTLTextureType2DMultisample : MTLTextureType2D;
desc.pixelFormat = format;
diff --git a/src/gpu/ganesh/mtl/GrMtlBuffer.mm b/src/gpu/ganesh/mtl/GrMtlBuffer.mm
index 0fa67b2..198715f 100644
--- a/src/gpu/ganesh/mtl/GrMtlBuffer.mm
+++ b/src/gpu/ganesh/mtl/GrMtlBuffer.mm
@@ -74,7 +74,7 @@
#ifdef SK_ENABLE_MTL_DEBUG_INFO
fMtlBuffer.label = kBufferTypeNames[(int)intendedType];
#endif
- this->registerWithCache(SkBudgeted::kYes);
+ this->registerWithCache(skgpu::Budgeted::kYes);
VALIDATE();
}
diff --git a/src/gpu/ganesh/mtl/GrMtlGpu.mm b/src/gpu/ganesh/mtl/GrMtlGpu.mm
index 4116d20..b9486fe 100644
--- a/src/gpu/ganesh/mtl/GrMtlGpu.mm
+++ b/src/gpu/ganesh/mtl/GrMtlGpu.mm
@@ -548,7 +548,7 @@
const GrBackendFormat& format,
GrRenderable renderable,
int renderTargetSampleCnt,
- SkBudgeted budgeted,
+ skgpu::Budgeted budgeted,
GrProtected isProtected,
int mipLevelCount,
uint32_t levelClearMask,
@@ -588,7 +588,7 @@
sk_sp<GrTexture> GrMtlGpu::onCreateCompressedTexture(SkISize dimensions,
const GrBackendFormat& format,
- SkBudgeted budgeted,
+ skgpu::Budgeted budgeted,
GrMipmapped mipmapped,
GrProtected isProtected,
const void* data, size_t dataSize) {
diff --git a/src/gpu/ganesh/mtl/GrMtlTexture.mm b/src/gpu/ganesh/mtl/GrMtlTexture.mm
index baa343b..75663ff 100644
--- a/src/gpu/ganesh/mtl/GrMtlTexture.mm
+++ b/src/gpu/ganesh/mtl/GrMtlTexture.mm
@@ -18,7 +18,7 @@
GR_NORETAIN_BEGIN
GrMtlTexture::GrMtlTexture(GrMtlGpu* gpu,
- SkBudgeted budgeted,
+ skgpu::Budgeted budgeted,
SkISize dimensions,
sk_sp<GrMtlAttachment> texture,
GrMipmapStatus mipmapStatus,
@@ -78,7 +78,7 @@
}
sk_sp<GrMtlTexture> GrMtlTexture::MakeNewTexture(GrMtlGpu* gpu,
- SkBudgeted budgeted,
+ skgpu::Budgeted budgeted,
SkISize dimensions,
MTLPixelFormat format,
uint32_t mipLevels,
diff --git a/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm b/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm
index 020ee66..8c517bb 100644
--- a/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm
+++ b/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm
@@ -18,7 +18,7 @@
GR_NORETAIN_BEGIN
GrMtlTextureRenderTarget::GrMtlTextureRenderTarget(GrMtlGpu* gpu,
- SkBudgeted budgeted,
+ skgpu::Budgeted budgeted,
SkISize dimensions,
sk_sp<GrMtlAttachment> texture,
sk_sp<GrMtlAttachment> colorAttachment,
@@ -69,7 +69,7 @@
sk_sp<GrMtlTextureRenderTarget> GrMtlTextureRenderTarget::MakeNewTextureRenderTarget(
GrMtlGpu* gpu,
- SkBudgeted budgeted,
+ skgpu::Budgeted budgeted,
SkISize dimensions,
int sampleCnt,
MTLPixelFormat format,
diff --git a/src/gpu/graphite/mtl/MtlResourceProvider.mm b/src/gpu/graphite/mtl/MtlResourceProvider.mm
index 6bb1aab..f5c161a 100644
--- a/src/gpu/graphite/mtl/MtlResourceProvider.mm
+++ b/src/gpu/graphite/mtl/MtlResourceProvider.mm
@@ -171,7 +171,7 @@
sk_sp<Texture> MtlResourceProvider::createTexture(SkISize dimensions,
const TextureInfo& info,
- SkBudgeted budgeted) {
+ skgpu::Budgeted budgeted) {
return MtlTexture::Make(this->mtlSharedContext(), dimensions, info, budgeted);
}
diff --git a/src/gpu/graphite/mtl/MtlTexture.mm b/src/gpu/graphite/mtl/MtlTexture.mm
index 383f4e1..69e7597 100644
--- a/src/gpu/graphite/mtl/MtlTexture.mm
+++ b/src/gpu/graphite/mtl/MtlTexture.mm
@@ -89,14 +89,14 @@
const TextureInfo& info,
sk_cfp<id<MTLTexture>> texture,
Ownership ownership,
- SkBudgeted budgeted)
+ skgpu::Budgeted budgeted)
: Texture(sharedContext, dimensions, info, /*mutableState=*/nullptr, ownership, budgeted)
, fTexture(std::move(texture)) {}
sk_sp<Texture> MtlTexture::Make(const MtlSharedContext* sharedContext,
SkISize dimensions,
const TextureInfo& info,
- SkBudgeted budgeted) {
+ skgpu::Budgeted budgeted) {
sk_cfp<id<MTLTexture>> texture = MakeMtlTexture(sharedContext, dimensions, info);
if (!texture) {
return nullptr;
@@ -118,7 +118,7 @@
info,
std::move(texture),
Ownership::kWrapped,
- SkBudgeted::kNo));
+ skgpu::Budgeted::kNo));
}
void MtlTexture::freeGpuData() {
diff --git a/src/image/SkSurface_GpuMtl.mm b/src/image/SkSurface_GpuMtl.mm
index b38f4dc..1a32e04 100644
--- a/src/image/SkSurface_GpuMtl.mm
+++ b/src/image/SkSurface_GpuMtl.mm
@@ -78,7 +78,7 @@
metalLayer.framebufferOnly ? nullptr : &texInfo,
GrMipmapStatus::kNotAllocated,
SkBackingFit::kExact,
- SkBudgeted::kYes,
+ skgpu::Budgeted::kYes,
GrProtected::kNo,
false,
GrSurfaceProxy::UseAllocator::kYes);
@@ -146,7 +146,7 @@
mtkView.framebufferOnly ? nullptr : &texInfo,
GrMipmapStatus::kNotAllocated,
SkBackingFit::kExact,
- SkBudgeted::kYes,
+ skgpu::Budgeted::kYes,
GrProtected::kNo,
false,
GrSurfaceProxy::UseAllocator::kYes);
diff --git a/tests/MtlCopySurfaceTest.mm b/tests/MtlCopySurfaceTest.mm
index c83bcec..e6fdf62 100644
--- a/tests/MtlCopySurfaceTest.mm
+++ b/tests/MtlCopySurfaceTest.mm
@@ -50,7 +50,7 @@
kTopLeft_GrSurfaceOrigin,
GrMipmapped::kNo,
SkBackingFit::kExact,
- SkBudgeted::kYes,
+ skgpu::Budgeted::kYes,
/*label=*/{});
// TODO: GrSurfaceProxy::Copy doesn't check to see if the framebufferOnly bit is set yet.
@@ -64,7 +64,7 @@
GrSurface* src = srcProxy->peekSurface();
sk_sp<GrTexture> dst =
gpu->createTexture({kWidth, kHeight}, backendFormat, GrTextureType::k2D,
- GrRenderable::kNo, 1, GrMipmapped::kNo, SkBudgeted::kNo,
+ GrRenderable::kNo, 1, GrMipmapped::kNo, skgpu::Budgeted::kNo,
GrProtected::kNo, /*label=*/"MtlCopySurfaceTest");
bool result = gpu->copySurface(dst.get(),
