mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-15 15:58:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge SDL-ryan-batching-renderer branch to default.

Browse Source
This commit is contained in:
Ryan C. Gordon
2018-10-31 15:03:41 -04:00
parent eb2536c466 ff3bb857ff
commit 62494a2e27
215 changed files with 5146 additions and 2712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/render/opengl/SDL_render_gl.c
View File

@@ -1529,7 +1529,7 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
data = (GL_RenderData *) SDL_calloc(1, sizeof(*data));
if (!data) {
GL_DestroyRenderer(renderer);
SDL_free(renderer);
SDL_OutOfMemory();
goto error;
}
@@ -1563,16 +1563,21 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
data->context = SDL_GL_CreateContext(window);
if (!data->context) {
GL_DestroyRenderer(renderer);
SDL_free(renderer);
SDL_free(data);
goto error;
}
if (SDL_GL_MakeCurrent(window, data->context) < 0) {
GL_DestroyRenderer(renderer);
SDL_GL_DeleteContext(data->context);
SDL_free(renderer);
SDL_free(data);
goto error;
}
if (GL_LoadFunctions(data) < 0) {
GL_DestroyRenderer(renderer);
SDL_GL_DeleteContext(data->context);
SDL_free(renderer);
SDL_free(data);
goto error;
}