scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-07 09:05:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

GL: small refactoring

Browse Source
This commit is contained in:
Martin Pulec
2012-07-27 13:31:49 +02:00
parent 8c3adf855a
commit 9758cd0d34
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/video_display/gl.c
View File

@@ -286,12 +286,6 @@ void * display_gl_init(char *fmt, unsigned int flags) {
UNUSED(flags);
struct state_gl *s;
#ifndef HAVE_MACOSX
x11_enter_thread();
#endif
glutInit(&uv_argc, uv_argv);
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE);
s = (struct state_gl *) calloc(1,sizeof(struct state_gl));
s->magic = MAGIC_GL;
@@ -360,8 +354,13 @@ void * display_gl_init(char *fmt, unsigned int flags) {
/* Startup function to call when running Cocoa code from a Carbon application. Whatever the fuck that means. */
/* Avoids uncaught exception (1002) when creating CGSWindow */
NSApplicationLoad();
#else
x11_enter_thread();
#endif
glutInit(&uv_argc, uv_argv);
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE);
#ifndef HAVE_MACOSX
glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_CONTINUE_EXECUTION);
#endif