Commit 6299daecbaf75c163903087594792ab2bcaf4da5
2014-08-06T00:28:02
The OpenGL context returned by the UIKit backend is now an actual OpenGL context instead of the OpenGL view we created. This allows you to use the returned context in functions like CVOpenGLESTextureCacheCreate()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
diff --git a/src/video/uikit/SDL_uikitopengles.m b/src/video/uikit/SDL_uikitopengles.m
index 42303e3..8d71ee8 100644
--- a/src/video/uikit/SDL_uikitopengles.m
+++ b/src/video/uikit/SDL_uikitopengles.m
@@ -51,14 +51,7 @@ UIKit_GL_GetProcAddress(_THIS, const char *proc)
*/
int UIKit_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
{
- if (context) {
- SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
- [data->view setCurrentContext];
- }
- else {
- [EAGLContext setCurrentContext: nil];
- }
-
+ [EAGLContext setCurrentContext: context];
return 0;
}
@@ -146,8 +139,9 @@ SDL_GLContext UIKit_GL_CreateContext(_THIS, SDL_Window * window)
uiwindow.rootViewController = view->viewcontroller;
}
- if (UIKit_GL_MakeCurrent(_this, window, view) < 0) {
- UIKit_GL_DeleteContext(_this, view);
+ EAGLContext *context = view.context;
+ if (UIKit_GL_MakeCurrent(_this, window, context) < 0) {
+ UIKit_GL_DeleteContext(_this, context);
return NULL;
}
@@ -157,23 +151,37 @@ SDL_GLContext UIKit_GL_CreateContext(_THIS, SDL_Window * window)
SDL_SetKeyboardFocus(window);
}
- return view;
+ return context;
}
void UIKit_GL_DeleteContext(_THIS, SDL_GLContext context)
{
- /* the delegate has retained the view, this will release him */
- SDL_uikitopenglview *view = (SDL_uikitopenglview *)context;
- if (view->viewcontroller) {
- UIWindow *uiwindow = (UIWindow *)view.superview;
- if (uiwindow.rootViewController == view->viewcontroller) {
- uiwindow.rootViewController = nil;
+ SDL_Window *window;
+
+ /* Find the view associated with this context */
+ for (window = _this->windows; window; window = window->next) {
+ SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+ SDL_uikitopenglview *view = data->view;
+ if (view.context == context) {
+ /* the delegate has retained the view, this will release him */
+ if (view->viewcontroller) {
+ UIWindow *uiwindow = (UIWindow *)view.superview;
+ if (uiwindow.rootViewController == view->viewcontroller) {
+ uiwindow.rootViewController = nil;
+ }
+ [view->viewcontroller setView:nil];
+ [view->viewcontroller release];
+ }
+ [view removeFromSuperview];
+
+ /* FIXME: This doesn't actually call view dealloc - what is holding a reference to it? */
+ [view release];
+ return;
}
- [view->viewcontroller setView:nil];
- [view->viewcontroller release];
}
- [view removeFromSuperview];
- [view release];
+
+ /* View not found... delete the context anyway? */
+ [(EAGLContext *)context release];
}
#endif /* SDL_VIDEO_DRIVER_UIKIT */