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/uikit/SDL_uikitopengles.m | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/source/src/video/uikit/SDL_uikitopengles.m b/source/src/video/uikit/SDL_uikitopengles.m
index 2f6dec4..fb0dae5 100644
--- a/source/src/video/uikit/SDL_uikitopengles.m
+++ b/source/src/video/uikit/SDL_uikitopengles.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
@@ -20,7 +20,7 @@
*/
#include "../../SDL_internal.h"
-#if SDL_VIDEO_DRIVER_UIKIT
+#if SDL_VIDEO_DRIVER_UIKIT && (SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2)
#include "SDL_uikitopengles.h"
#import "SDL_uikitopenglview.h"
@@ -96,6 +96,8 @@
if (h) {
*h = glview.backingHeight;
}
+ } else {
+ SDL_GetWindowSize(window, w, h);
}
}
}
@@ -168,12 +170,9 @@
/* Set the scale to the natural scale factor of the screen - the
* backing dimensions of the OpenGL view will match the pixel
* dimensions of the screen rather than the dimensions in points. */
-#ifdef __IPHONE_8_0
if ([data.uiwindow.screen respondsToSelector:@selector(nativeScale)]) {
scale = data.uiwindow.screen.nativeScale;
- } else
-#endif
- {
+ } else {
scale = data.uiwindow.screen.scale;
}
}
--
Gitblit v1.9.3