Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions shell/platform/darwin/ios/ios_external_texture_gl.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ class IOSExternalTextureGL final : public Texture {

void CreateRGBATextureFromPixelBuffer();

sk_sp<SkImage> CreateImageFromYUVTextures(GrContext* context, const SkRect& bounds);
sk_sp<SkImage> CreateImageFromYUVTextures(GrDirectContext* context, const SkRect& bounds);

sk_sp<SkImage> CreateImageFromRGBATexture(GrContext* context, const SkRect& bounds);
sk_sp<SkImage> CreateImageFromRGBATexture(GrDirectContext* context, const SkRect& bounds);

FML_DISALLOW_COPY_AND_ASSIGN(IOSExternalTextureGL);
};
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/darwin/ios/ios_external_texture_gl.mm
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
}
}

sk_sp<SkImage> IOSExternalTextureGL::CreateImageFromRGBATexture(GrContext* context,
sk_sp<SkImage> IOSExternalTextureGL::CreateImageFromRGBATexture(GrDirectContext* context,
const SkRect& bounds) {
GrGLTextureInfo textureInfo = {CVOpenGLESTextureGetTarget(texture_ref_),
CVOpenGLESTextureGetName(texture_ref_), GL_RGBA8_OES};
Expand All @@ -106,7 +106,7 @@
return image;
}

sk_sp<SkImage> IOSExternalTextureGL::CreateImageFromYUVTextures(GrContext* context,
sk_sp<SkImage> IOSExternalTextureGL::CreateImageFromYUVTextures(GrDirectContext* context,
const SkRect& bounds) {
GrGLTextureInfo yTextureInfo = {CVOpenGLESTextureGetTarget(y_texture_ref_),
CVOpenGLESTextureGetName(y_texture_ref_), GR_GL_LUMINANCE8};
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/fuchsia/flutter/compositor_context.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace flutter_runner {
class ScopedFrame final : public flutter::CompositorContext::ScopedFrame {
public:
ScopedFrame(CompositorContext& context,
GrContext* gr_context,
GrDirectContext* gr_context,
SkCanvas* canvas,
flutter::ExternalViewEmbedder* view_embedder,
const SkMatrix& root_surface_transformation,
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/fuchsia/flutter/vulkan_surface_producer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ void VulkanSurfaceProducer::OnSurfacesPresented(

// Do a single flush for all canvases derived from the context.
{
TRACE_EVENT0("flutter", "GrContext::flushAndSignalSemaphores");
TRACE_EVENT0("flutter", "GrDirectContext::flushAndSignalSemaphores");
context_->flushAndSubmit();
}

Expand Down