Skip to content

Commit bc394f3

Browse files
kjlubickRicardo Amador
kjlubick
authored and
Ricardo Amador
committed
SkBudgeted -> skgpu::Budgeted (flutter#38660)
* SkBudgeted -> skgpu::Budgeted * colon * format * fix GN rules * undo includes
1 parent 8780330 commit bc394f3

13 files changed

+26
-25
lines changed

‎display_list/display_list_benchmarks_gl.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void OpenGLCanvasProvider::InitializeSurface(const size_t width,
1919

2020
const auto image_info = SkImageInfo::MakeN32Premul(surface_size_);
2121
surface_ = SkSurface::MakeRenderTarget(
22-
gl_surface_->GetGrContext().get(), SkBudgeted::kNo, image_info, 1,
22+
gl_surface_->GetGrContext().get(), skgpu::Budgeted::kNo, image_info, 1,
2323
kTopLeft_GrSurfaceOrigin, nullptr, false);
2424
surface_->getCanvas()->clear(SK_ColorTRANSPARENT);
2525
}
@@ -38,7 +38,7 @@ sk_sp<SkSurface> OpenGLCanvasProvider::MakeOffscreenSurface(
3838
const auto image_info = SkImageInfo::MakeN32Premul(surface_size_);
3939

4040
auto offscreen_surface = SkSurface::MakeRenderTarget(
41-
gl_surface_->GetGrContext().get(), SkBudgeted::kNo, image_info, 1,
41+
gl_surface_->GetGrContext().get(), skgpu::Budgeted::kNo, image_info, 1,
4242
kTopLeft_GrSurfaceOrigin, nullptr, false);
4343

4444
offscreen_surface->getCanvas()->clear(SK_ColorTRANSPARENT);

‎flow/layers/offscreen_surface.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ static sk_sp<SkSurface> CreateSnapshotSurface(GrDirectContext* surface_context,
2121
// There is a rendering surface that may contain textures that are going to
2222
// be referenced in the layer tree about to be drawn.
2323
return SkSurface::MakeRenderTarget(
24-
reinterpret_cast<GrRecordingContext*>(surface_context), SkBudgeted::kNo,
25-
image_info);
24+
reinterpret_cast<GrRecordingContext*>(surface_context),
25+
skgpu::Budgeted::kNo, image_info);
2626
}
2727

2828
// There is no rendering surface, assume no GPU textures are present and

‎flow/raster_cache.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ std::unique_ptr<RasterCacheResult> RasterCache::Rasterize(
6363
sk_ref_sp(context.dst_color_space));
6464

6565
sk_sp<SkSurface> surface =
66-
context.gr_context ? SkSurface::MakeRenderTarget(
67-
context.gr_context, SkBudgeted::kYes, image_info)
68-
: SkSurface::MakeRaster(image_info);
66+
context.gr_context
67+
? SkSurface::MakeRenderTarget(context.gr_context,
68+
skgpu::Budgeted::kYes, image_info)
69+
: SkSurface::MakeRaster(image_info);
6970

7071
if (!surface) {
7172
return nullptr;

‎lib/ui/painting/image_encoding_impl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ sk_sp<SkImage> ConvertToRasterUsingResourceContext(
2828
.SetIfFalse([&surface, &surface_info, resource_context] {
2929
if (resource_context) {
3030
surface = SkSurface::MakeRenderTarget(
31-
resource_context.get(), SkBudgeted::kNo, surface_info);
31+
resource_context.get(), skgpu::Budgeted::kNo, surface_info);
3232
} else {
3333
surface = SkSurface::MakeRaster(surface_info);
3434
}

‎shell/common/rasterizer_unittests.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,8 +913,8 @@ TEST(RasterizerTest, TeardownFreesResourceCache) {
913913

914914
auto image_info =
915915
SkImageInfo::MakeN32Premul(500, 500, SkColorSpace::MakeSRGB());
916-
auto sk_surface =
917-
SkSurface::MakeRenderTarget(context.get(), SkBudgeted::kYes, image_info);
916+
auto sk_surface = SkSurface::MakeRenderTarget(
917+
context.get(), skgpu::Budgeted::kYes, image_info);
918918
EXPECT_TRUE(sk_surface);
919919

920920
SkPaint paint;

‎shell/common/shell_test_platform_view_vulkan.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ ShellTestPlatformViewVulkan::OffScreenSurface::AcquireFrame(
194194
const SkISize& size) {
195195
auto image_info = SkImageInfo::Make(size, SkColorType::kRGBA_8888_SkColorType,
196196
SkAlphaType::kOpaque_SkAlphaType);
197-
auto surface = SkSurface::MakeRenderTarget(context_.get(), SkBudgeted::kNo,
198-
image_info, 0, nullptr);
197+
auto surface = SkSurface::MakeRenderTarget(
198+
context_.get(), skgpu::Budgeted::kNo, image_info, 0, nullptr);
199199
SurfaceFrame::SubmitCallback callback = [](const SurfaceFrame&,
200200
SkCanvas* canvas) -> bool {
201201
canvas->flush();

‎shell/common/snapshot_controller_skia.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ sk_sp<DlImage> SnapshotControllerSkia::DoMakeRasterSnapshot(
104104
// When there is an on screen surface, we need a render target
105105
// SkSurface because we want to access texture backed images.
106106
sk_sp<SkSurface> sk_surface =
107-
SkSurface::MakeRenderTarget(context, // context
108-
SkBudgeted::kNo, // budgeted
109-
image_info // image info
107+
SkSurface::MakeRenderTarget(context, // context
108+
skgpu::Budgeted::kNo, // budgeted
109+
image_info // image info
110110
);
111111
if (!sk_surface) {
112112
FML_LOG(ERROR)

‎shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ - (CVPixelBufferRef)pixelBuffer {
7575
[[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice];
7676
SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
7777
GrDirectContext* grContext = darwinContextMetal.mainContext.get();
78-
sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info));
78+
sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu::Budgeted::kNo, info));
7979

8080
// Create a texture.
8181
MTLTextureDescriptor* textureDescriptor = [[MTLTextureDescriptor alloc] init];
@@ -133,7 +133,7 @@ - (CVPixelBufferRef)pixelBuffer {
133133
[[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice];
134134
SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
135135
GrDirectContext* grContext = darwinContextMetal.mainContext.get();
136-
sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info));
136+
sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu::Budgeted::kNo, info));
137137

138138
// Create a texture.
139139
TestExternalTexture* testExternalTexture =
@@ -185,7 +185,7 @@ - (CVPixelBufferRef)pixelBuffer {
185185
[[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice];
186186
SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
187187
GrDirectContext* grContext = darwinContextMetal.mainContext.get();
188-
sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info));
188+
sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu::Budgeted::kNo, info));
189189

190190
// Create a texture.
191191
TestExternalTexture* testExternalTexture =
@@ -239,7 +239,7 @@ - (CVPixelBufferRef)pixelBuffer {
239239
[[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice];
240240
SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
241241
GrDirectContext* grContext = darwinContextMetal.mainContext.get();
242-
sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info));
242+
sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu::Budgeted::kNo, info));
243243

244244
// Create a texture.
245245
TestExternalTexture* testExternalTexture =

‎shell/platform/embedder/tests/embedder_test_backingstore_producer.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ bool EmbedderTestBackingStoreProducer::CreateFramebuffer(
8383

8484
auto surface = SkSurface::MakeRenderTarget(
8585
context_.get(), // context
86-
SkBudgeted::kNo, // budgeted
86+
skgpu::Budgeted::kNo, // budgeted
8787
image_info, // image info
8888
1, // sample count
8989
kBottomLeft_GrSurfaceOrigin, // surface origin
@@ -136,7 +136,7 @@ bool EmbedderTestBackingStoreProducer::CreateTexture(
136136

137137
auto surface = SkSurface::MakeRenderTarget(
138138
context_.get(), // context
139-
SkBudgeted::kNo, // budgeted
139+
skgpu::Budgeted::kNo, // budgeted
140140
image_info, // image info
141141
1, // sample count
142142
kBottomLeft_GrSurfaceOrigin, // surface origin

‎shell/platform/embedder/tests/embedder_test_compositor_gl.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bool EmbedderTestCompositorGL::UpdateOffscrenComposition(
2929

3030
auto surface =
3131
SkSurface::MakeRenderTarget(context_.get(), // context
32-
SkBudgeted::kNo, // budgeted
32+
skgpu::Budgeted::kNo, // budgeted
3333
image_info, // image info
3434
1, // sample count
3535
kTopLeft_GrSurfaceOrigin, // surface origin

0 commit comments

Comments
 (0)