diff options
Diffstat (limited to 'src/video/cocoa')
-rw-r--r-- | src/video/cocoa/SDL_cocoametalview.h | 10 | ||||
-rw-r--r-- | src/video/cocoa/SDL_cocoametalview.m | 13 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/video/cocoa/SDL_cocoametalview.h b/src/video/cocoa/SDL_cocoametalview.h index 745dea3513..8550ebe1c1 100644 --- a/src/video/cocoa/SDL_cocoametalview.h +++ b/src/video/cocoa/SDL_cocoametalview.h @@ -32,11 +32,11 @@ #import "../SDL_sysvideo.h" #import "SDL_cocoawindow.h" -#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_COCOA +#if SDL_VIDEO_DRIVER_COCOA && (SDL_VIDEO_VULKAN || SDL_VIDEO_RENDER_METAL) -#include <Cocoa/Cocoa.h> -#include <Metal/Metal.h> -#include <QuartzCore/CAMetalLayer.h> +#import <Cocoa/Cocoa.h> +#import <Metal/Metal.h> +#import <QuartzCore/CAMetalLayer.h> #define METALVIEW_TAG 255 @@ -57,7 +57,7 @@ SDL_cocoametalview* Cocoa_Mtl_AddMetalView(SDL_Window* window); void Cocoa_Mtl_GetDrawableSize(SDL_Window * window, int * w, int * h); -#endif /* SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_COCOA */ +#endif /* SDL_VIDEO_DRIVER_COCOA && (SDL_VIDEO_VULKAN || SDL_VIDEO_RENDER_METAL) */ #endif /* SDL_cocoametalview_h_ */ diff --git a/src/video/cocoa/SDL_cocoametalview.m b/src/video/cocoa/SDL_cocoametalview.m index 562eecca84..8078803d68 100644 --- a/src/video/cocoa/SDL_cocoametalview.m +++ b/src/video/cocoa/SDL_cocoametalview.m @@ -28,7 +28,7 @@ #import "SDL_cocoametalview.h" -#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_COCOA +#if SDL_VIDEO_DRIVER_COCOA && (SDL_VIDEO_VULKAN || SDL_VIDEO_RENDER_METAL) #include "SDL_assert.h" @@ -44,7 +44,7 @@ } /* Indicate the view wants to draw using a backing layer instead of drawRect. */ --(BOOL) wantsUpdateLayer +- (BOOL)wantsUpdateLayer { return YES; } @@ -52,7 +52,7 @@ /* When the wantsLayer property is set to YES, this method will be invoked to * return a layer instance. */ --(CALayer*) makeBackingLayer +- (CALayer*)makeBackingLayer { return [self.class.layerClass layer]; } @@ -74,8 +74,9 @@ } /* Set the size of the metal drawables when the view is resized. */ -- (void)resizeSubviewsWithOldSize:(NSSize)oldSize { - [super resizeSubviewsWithOldSize:oldSize]; +- (void)resizeWithOldSuperviewSize:(NSSize)oldSize +{ + [super resizeWithOldSuperviewSize:oldSize]; [self updateDrawableSize]; } @@ -123,6 +124,6 @@ Cocoa_Mtl_GetDrawableSize(SDL_Window * window, int * w, int * h) } } -#endif /* SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_COCOA */ +#endif /* SDL_VIDEO_DRIVER_COCOA && (SDL_VIDEO_VULKAN || SDL_VIDEO_RENDER_METAL) */ /* vi: set ts=4 sw=4 expandtab: */ |