From 03f8528315fa46c95991a34f3325d7b33ae5538c Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Sat, 02 May 2020 21:48:36 +0000
Subject: [PATCH] Update source to SDL2 2.0.12
---
source/src/video/cocoa/SDL_cocoavideo.m | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/source/src/video/cocoa/SDL_cocoavideo.m b/source/src/video/cocoa/SDL_cocoavideo.m
index 20bdfa7..f51c98c 100644
--- a/source/src/video/cocoa/SDL_cocoavideo.m
+++ b/source/src/video/cocoa/SDL_cocoavideo.m
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
- Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -27,6 +27,7 @@
#include "SDL_cocoavideo.h"
#include "SDL_cocoashape.h"
#include "SDL_cocoavulkan.h"
+#include "SDL_cocoametalview.h"
#include "SDL_assert.h"
/* Initialization/Query functions */
@@ -142,6 +143,11 @@
device->Vulkan_GetDrawableSize = Cocoa_Vulkan_GetDrawableSize;
#endif
+#if SDL_VIDEO_METAL
+ device->Metal_CreateView = Cocoa_Metal_CreateView;
+ device->Metal_DestroyView = Cocoa_Metal_DestroyView;
+#endif
+
device->StartTextInput = Cocoa_StartTextInput;
device->StopTextInput = Cocoa_StopTextInput;
device->SetTextInputRect = Cocoa_SetTextInputRect;
@@ -168,7 +174,9 @@
Cocoa_InitModes(_this);
Cocoa_InitKeyboard(_this);
- Cocoa_InitMouse(_this);
+ if (Cocoa_InitMouse(_this) < 0) {
+ return -1;
+ }
data->allow_spaces = ((floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) && SDL_GetHintBoolean(SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES, SDL_TRUE));
@@ -250,6 +258,9 @@
*
* This doesn't really have aything to do with the interfaces of the SDL video
* subsystem, but we need to stuff this into an Objective-C source code file.
+ *
+ * NOTE: This is copypasted in src/video/uikit/SDL_uikitvideo.m! Be sure both
+ * versions remain identical!
*/
void SDL_NSLog(const char *text)
--
Gitblit v1.9.3