summaryrefslogtreecommitdiffstats
path: root/tools/platform/apple
diff options
context:
space:
mode:
authorSimon Kallweit <simon.kallweit@gmail.com>2024-02-27 00:32:03 +0100
committerGitHub <noreply@github.com>2024-02-26 15:32:03 -0800
commit4f03eb9d657fd74da341bb2b0d391c6b855073af (patch)
treebd091ec05b0878f92757de8b3ac011b856be9a33 /tools/platform/apple
parentceb87b25b387411dbb7978caf04ecd9e948493e3 (diff)
switch to vkCreateMetalSurfaceEXT and create metal layer in swapchain (#3627)
* switch to vkCreateMetalSurfaceEXT and create metal layer in swapchain * fix window content size on macos --------- Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'tools/platform/apple')
-rw-r--r--tools/platform/apple/cocoa-window.mm20
1 files changed, 1 insertions, 19 deletions
diff --git a/tools/platform/apple/cocoa-window.mm b/tools/platform/apple/cocoa-window.mm
index 450087dd2..b985cb4f3 100644
--- a/tools/platform/apple/cocoa-window.mm
+++ b/tools/platform/apple/cocoa-window.mm
@@ -50,8 +50,6 @@ class CocoaPlatformWindow : public Window
public:
NSWindow* window;
WindowDelegate* delegate;
- ContentView* view;
- CAMetalLayer* layer;
bool shouldClose = false;
CocoaPlatformWindow(const WindowDesc& desc);
@@ -516,26 +514,14 @@ CocoaPlatformWindow::CocoaPlatformWindow(const WindowDesc& desc)
else if (desc.style == WindowStyle::FixedSize)
[window setStyleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable];
- // Allocate view
- rect = [window backingAlignedRect:rect options:NSAlignAllEdgesOutward];
- view = [[ContentView alloc] initWithPlatformWindow:this];
- [view setHidden:NO];
- [view setNeedsDisplay:YES];
- [view setWantsLayer:YES];
-
delegate = [[WindowDelegate alloc] initWithPlatformWindow:this];
[window setDelegate:delegate];
- [window setContentView:view];
NSString* title = [NSString stringWithUTF8String:desc.title];
[window setTitle:title];
[window center];
[window makeKeyAndOrderFront:nil];
-
- // Setup layer
- layer = [[CAMetalLayer alloc] init];
- [view setLayer:layer];
}
CocoaPlatformWindow::~CocoaPlatformWindow()
@@ -564,13 +550,9 @@ void CocoaPlatformWindow::close()
{
[window release];
[delegate release];
- [view release];
- [layer release];
window = nil;
delegate = nil;
- view = nil;
- layer = nil;
}
bool CocoaPlatformWindow::getFocused()
@@ -585,7 +567,7 @@ bool CocoaPlatformWindow::getVisible()
WindowHandle CocoaPlatformWindow::getNativeHandle()
{
- return WindowHandle::fromNSView(view);
+ return WindowHandle::fromNSWindow(window);
}
void CocoaPlatformWindow::setText(Slang::String text)