Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-16 11:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed iOS build

Browse Source
This commit is contained in:
Sam Lantinga 2020-05-26 13:54:47 -07:00
parent cc2fe84d73
commit 15294e2121
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/render/metal/SDL_render_metal.m
View File

@ -1597,14 +1597,17 @@ METAL_CreateRenderer(SDL_Window * window, Uint32 flags)
if (!(window_flags & SDL_WINDOW_METAL)) { if (!(window_flags & SDL_WINDOW_METAL)) {
changed_window = SDL_TRUE; changed_window = SDL_TRUE;
if (SDL_RecreateWindow(window, (window_flags & ~SDL_WINDOW_OPENGL) | SDL_WINDOW_METAL) < 0) { if (SDL_RecreateWindow(window, (window_flags & ~SDL_WINDOW_OPENGL) | SDL_WINDOW_METAL) < 0) {
goto error; return NULL;
} }
} }
renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer)); renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
if (!renderer) { if (!renderer) {
SDL_OutOfMemory(); SDL_OutOfMemory();
goto error; if (changed_window) {
SDL_RecreateWindow(window, window_flags);
}
return NULL;
} }
// !!! FIXME: MTLCopyAllDevices() can find other GPUs on macOS... // !!! FIXME: MTLCopyAllDevices() can find other GPUs on macOS...
@ -1613,7 +1616,10 @@ METAL_CreateRenderer(SDL_Window * window, Uint32 flags)
if (mtldevice == nil) { if (mtldevice == nil) {
SDL_free(renderer); SDL_free(renderer);
SDL_SetError("Failed to obtain Metal device"); SDL_SetError("Failed to obtain Metal device");
goto error; if (changed_window) {
SDL_RecreateWindow(window, window_flags);
}
return NULL;
} }
view = SDL_Metal_CreateView(window); view = SDL_Metal_CreateView(window);
@ -1623,7 +1629,10 @@ METAL_CreateRenderer(SDL_Window * window, Uint32 flags)
[mtldevice release]; [mtldevice release];
#endif #endif
SDL_free(renderer); SDL_free(renderer);
goto error; if (changed_window) {
SDL_RecreateWindow(window, window_flags);
}
return NULL;
} }
// !!! FIXME: error checking on all of this. // !!! FIXME: error checking on all of this.
@ -1635,7 +1644,10 @@ METAL_CreateRenderer(SDL_Window * window, Uint32 flags)
#endif #endif
SDL_Metal_DestroyView(view); SDL_Metal_DestroyView(view);
SDL_free(renderer); SDL_free(renderer);
goto error; if (changed_window) {
SDL_RecreateWindow(window, window_flags);
}
return NULL;
} }
renderer->driverdata = (void*)CFBridgingRetain(data); renderer->driverdata = (void*)CFBridgingRetain(data);
@ -1874,13 +1886,6 @@ METAL_CreateRenderer(SDL_Window * window, Uint32 flags)
#endif #endif
return renderer; return renderer;
error:
if (changed_window) {
/* Uh oh, better try to put it back... */
SDL_RecreateWindow(window, window_flags);
}
return NULL;
}} }}
SDL_RenderDriver METAL_RenderDriver = { SDL_RenderDriver METAL_RenderDriver = {