From b99646741bc48f9b82538a3a6ab448804d150abf Mon Sep 17 00:00:00 2001 From: molivier Date: Sun, 20 Nov 2005 15:14:10 +0000 Subject: [PATCH] Fixed black screen when using fullscreen mode on Mac OS X git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5812 d7cf8633-e32d-0410-b094-e92efae38249 --- vid_agl.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/vid_agl.c b/vid_agl.c index 78616057..12752c35 100644 --- a/vid_agl.c +++ b/vid_agl.c @@ -378,13 +378,22 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) // Set context and show the window context = qaglCreateContext(pixelFormat, NULL); - qaglDestroyPixelFormat(pixelFormat); if (context == NULL) Sys_Error ("aglCreateContext failed"); - if (!qaglSetDrawable(context, GetWindowPort(window))) - Sys_Error ("aglSetDrawable failed"); + if (fullscreen) + { + if (!qaglSetFullScreen (context, width, height, 0, 0)) + Sys_Error("aglSetFullScreen failed"); + vid_isfullscreen = true; + } + else + { + if (!qaglSetDrawable(context, GetWindowPort(window))) + Sys_Error ("aglSetDrawable failed"); + } if (!qaglSetCurrentContext(context)) Sys_Error ("aglSetCurrentContext failed"); + qaglDestroyPixelFormat(pixelFormat); scr_width = width; scr_height = height; @@ -392,13 +401,6 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL) Sys_Error("glGetString not found in %s", gl_driver); - if (fullscreen) - { - if (!qaglSetFullScreen (context, width, height, 0, 0)) - Sys_Error("aglSetFullScreen failed"); - vid_isfullscreen = true; - } - gl_renderer = (const char *)qglGetString(GL_RENDERER); gl_vendor = (const char *)qglGetString(GL_VENDOR); gl_version = (const char *)qglGetString(GL_VERSION); -- 2.39.2