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 1 commit
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
Prev Previous commit
Next Next commit
Merge branch 'master' into metal-on-simulator
  • Loading branch information
Kavantix authored Oct 1, 2020
commit eed65a56ce22a8ee77a9d040775e51f050b5f7bb
2 changes: 1 addition & 1 deletion shell/gpu/gpu_surface_metal.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "flutter/fml/macros.h"
#include "flutter/fml/platform/darwin/scoped_nsobject.h"
#include "flutter/shell/gpu/gpu_surface_delegate.h"
#include "third_party/skia/include/gpu/GrContext.h"
#include "third_party/skia/include/gpu/mtl/GrMtlTypes.h"
#include "third_party/skia/include/gpu/GrDirectContext.h"

@class CAMetalLayer;

Expand Down
2 changes: 1 addition & 1 deletion shell/platform/darwin/ios/ios_surface_metal.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

#include "flutter/fml/macros.h"
#include "flutter/shell/gpu/gpu_surface_delegate.h"
#include "flutter/shell/platform/darwin/ios/ios_surface.h"
#include "third_party/skia/include/gpu/mtl/GrMtlTypes.h"
#import "flutter/shell/platform/darwin/ios/ios_surface.h"

@class CAMetalLayer;

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.