X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_agl.c;h=4ecbd2ee4b0a1ee74ead33481d4322b01847cb58;hb=6c4d997a497cb5afde74b4bf16f6a9ade5aca37e;hp=8a765011f38241ef3d58e785470b8f42a0205eda;hpb=da29a8beeb35293e2fd38b51883c91b5cf4cf4ad;p=xonotic%2Fdarkplaces.git diff --git a/vid_agl.c b/vid_agl.c index 8a765011..4ecbd2ee 100644 --- a/vid_agl.c +++ b/vid_agl.c @@ -24,9 +24,14 @@ #include #include #include +#include #include +#include "vid_agl_mackeys.h" // this is SDL/src/video/maccommon/SDL_mackeys.h #include "quakedef.h" +#ifndef kCGLCEMPEngine +#define kCGLCEMPEngine 313 +#endif // Tell startup code that we have a client int cl_available = true; @@ -45,7 +50,11 @@ GLboolean (*qaglSetDrawable) (AGLContext ctx, AGLDrawable draw); GLboolean (*qaglSetFullScreen) (AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device); GLboolean (*qaglSetInteger) (AGLContext ctx, GLenum pname, const GLint *params); void (*qaglSwapBuffers) (AGLContext ctx); +CGLError (*qCGLEnable) (CGLContextObj ctx, CGLContextEnable pname); +CGLError (*qCGLDisable) (CGLContextObj ctx, CGLContextEnable pname); +CGLContextObj (*qCGLGetCurrentContext) (void); +static qboolean multithreadedgl; static qboolean mouse_avail = true; static qboolean vid_usingmouse = false; static float mouse_x, mouse_y; @@ -57,6 +66,8 @@ static qboolean sound_active = true; static int scr_width, scr_height; +static cvar_t apple_multithreadedgl = {CVAR_SAVE, "apple_multithreadedgl", "0", "makes use of a second thread for the OpenGL driver (if possible) rather than using the engine thread (note: this is done automatically on most other operating systems)"}; + static AGLContext context; static WindowRef window; @@ -146,6 +157,42 @@ void VID_Finish (qboolean allowmousegrab) qaglSwapBuffers(context); } VID_UpdateGamma(false, GAMMA_TABLE_SIZE); + + if (apple_multithreadedgl.integer) + { + if (!multithreadedgl) + { + if(qCGLGetCurrentContext && qCGLEnable && qCGLDisable) + { + CGLContextObj ctx = qCGLGetCurrentContext(); + CGLError e = qCGLEnable(ctx, kCGLCEMPEngine); + if(e == kCGLNoError) + multithreadedgl = true; + else + { + Con_Printf("WARNING: can't enable multithreaded GL, error %d\n", (int) e); + Cvar_SetValueQuick(&apple_multithreadedgl, 0); + } + } + else + { + Con_Printf("WARNING: can't enable multithreaded GL, CGL functions not present\n"); + Cvar_SetValueQuick(&apple_multithreadedgl, 0); + } + } + } + else + { + if (multithreadedgl) + { + if(qCGLGetCurrentContext && qCGLEnable && qCGLDisable) + { + CGLContextObj ctx = qCGLGetCurrentContext(); + qCGLDisable(ctx, kCGLCEMPEngine); + multithreadedgl = false; + } + } + } } int VID_SetGamma(unsigned short *ramps, int rampsize) @@ -207,8 +254,7 @@ void signal_handler(int sig) { printf("Received signal %d, exiting...\n", sig); VID_RestoreSystemGamma(); - Sys_Quit(); - exit(0); + Sys_Quit(1); } void InitSig(void) @@ -228,15 +274,20 @@ void InitSig(void) void VID_Init(void) { InitSig(); // trap evil signals + Cvar_RegisterVariable(&apple_multithreadedgl); // COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) - if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) + if (COM_CheckParm ("-nomouse")) mouse_avail = false; } static void *prjobj = NULL; +static void *cglobj = NULL; static void GL_CloseLibrary(void) { + if (cglobj) + dlclose(cglobj); + cglobj = NULL; if (prjobj) dlclose(prjobj); prjobj = NULL; @@ -249,6 +300,7 @@ static void GL_CloseLibrary(void) static int GL_OpenLibrary(void) { const char *name = "/System/Library/Frameworks/AGL.framework/AGL"; + const char *name2 = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; Con_Printf("Loading OpenGL driver %s\n", name); GL_CloseLibrary(); @@ -257,7 +309,12 @@ static int GL_OpenLibrary(void) Con_Printf("Unable to open symbol list for %s\n", name); return false; } - strcpy(gl_driver, name); + strlcpy(gl_driver, name, sizeof(gl_driver)); + + Con_Printf("Loading OpenGL driver %s\n", name2); + if (!(cglobj = dlopen(name2, RTLD_LAZY))) + Con_Printf("Unable to open symbol list for %s; multithreaded GL disabled\n", name); + return true; } @@ -266,6 +323,13 @@ void *GL_GetProcAddress(const char *name) return dlsym(prjobj, name); } +static void *CGL_GetProcAddress(const char *name) +{ + if(!cglobj) + return NULL; + return dlsym(cglobj, name); +} + void VID_Shutdown(void) { if (context == NULL && window == NULL) @@ -357,10 +421,10 @@ static void VID_ProcessPendingAsyncEvents (void) // Closed if (AsyncEvent_Quitting) - Sys_Quit(); + Sys_Quit(0); } -static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen) +static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen, qboolean stereobuffer) { *attrib++ = AGL_RGBA; *attrib++ = AGL_RED_SIZE;*attrib++ = 1; @@ -377,10 +441,12 @@ static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscr } if (fullscreen) *attrib++ = AGL_FULLSCREEN; + if (stereobuffer) + *attrib++ = AGL_STEREO; *attrib++ = AGL_NONE; } -int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate) +int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer) { const EventTypeSpec winEvents[] = { @@ -419,6 +485,12 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate return false; } + qCGLEnable = (CGLError (*) (CGLContextObj ctx, CGLContextEnable pname)) CGL_GetProcAddress("CGLEnable"); + qCGLDisable = (CGLError (*) (CGLContextObj ctx, CGLContextEnable pname)) CGL_GetProcAddress("CGLDisable"); + qCGLGetCurrentContext = (CGLContextObj (*) (void)) CGL_GetProcAddress("CGLGetCurrentContext"); + if(!qCGLEnable || !qCGLDisable || !qCGLGetCurrentContext) + Con_Printf("CGL functions not found; disabling multithreaded OpenGL\n"); + // Ignore the events from the previous window AsyncEvent_Quitting = false; AsyncEvent_Collapsed = false; @@ -431,7 +503,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate carbonError = CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowStandardHandlerAttribute, &windowBounds, &window); if (carbonError != noErr || window == NULL) { - Con_Printf("Unable to create window (error %d)\n", carbonError); + Con_Printf("Unable to create window (error %u)\n", (unsigned)carbonError); return false; } @@ -445,7 +517,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate GetEventTypeCount(winEvents), winEvents, window, NULL); // Create the desired attribute list - VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen); + VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen, stereobuffer); if (!fullscreen) { @@ -551,6 +623,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate gl_platform = "AGL"; gl_videosyncavailable = true; + multithreadedgl = false; vid_isfullscreen = fullscreen; vid_usingmouse = false; vid_hidden = false; @@ -595,72 +668,176 @@ static void Handle_KeyMod(UInt32 keymod) prev_keymod = keymod; } -static void Handle_Key(unsigned char charcode, qboolean keypressed) +static void Handle_Key(unsigned char charcode, UInt32 mackeycode, qboolean keypressed) { unsigned int keycode = 0; char ascii = '\0'; - switch (charcode) + switch (mackeycode) { - case kHomeCharCode: - keycode = K_HOME; + case MK_ESCAPE: + keycode = K_ESCAPE; break; - case kEnterCharCode: - keycode = K_KP_ENTER; + case MK_F1: + keycode = K_F1; break; - case kEndCharCode: - keycode = K_END; + case MK_F2: + keycode = K_F2; + break; + case MK_F3: + keycode = K_F3; + break; + case MK_F4: + keycode = K_F4; + break; + case MK_F5: + keycode = K_F5; + break; + case MK_F6: + keycode = K_F6; + break; + case MK_F7: + keycode = K_F7; + break; + case MK_F8: + keycode = K_F8; + break; + case MK_F9: + keycode = K_F9; break; - case kBackspaceCharCode: + case MK_F10: + keycode = K_F10; + break; + case MK_F11: + keycode = K_F11; + break; + case MK_F12: + keycode = K_F12; + break; + case MK_SCROLLOCK: + keycode = K_SCROLLOCK; + break; + case MK_PAUSE: + keycode = K_PAUSE; + break; + case MK_BACKSPACE: keycode = K_BACKSPACE; break; - case kTabCharCode: - keycode = K_TAB; + case MK_INSERT: + keycode = K_INS; + break; + case MK_HOME: + keycode = K_HOME; break; - case kPageUpCharCode: + case MK_PAGEUP: keycode = K_PGUP; break; - case kPageDownCharCode: + case MK_NUMLOCK: + keycode = K_NUMLOCK; + break; + case MK_KP_EQUALS: + keycode = K_KP_EQUALS; + break; + case MK_KP_DIVIDE: + keycode = K_KP_DIVIDE; + break; + case MK_KP_MULTIPLY: + keycode = K_KP_MULTIPLY; + break; + case MK_TAB: + keycode = K_TAB; + break; + case MK_DELETE: + keycode = K_DEL; + break; + case MK_END: + keycode = K_END; + break; + case MK_PAGEDOWN: keycode = K_PGDN; break; - case kReturnCharCode: + case MK_KP7: + keycode = K_KP_7; + break; + case MK_KP8: + keycode = K_KP_8; + break; + case MK_KP9: + keycode = K_KP_9; + break; + case MK_KP_MINUS: + keycode = K_KP_MINUS; + break; + case MK_CAPSLOCK: + keycode = K_CAPSLOCK; + break; + case MK_RETURN: keycode = K_ENTER; break; - case kEscapeCharCode: - keycode = K_ESCAPE; + case MK_KP4: + keycode = K_KP_4; break; - case kLeftArrowCharCode: - keycode = K_LEFTARROW; + case MK_KP5: + keycode = K_KP_5; break; - case kRightArrowCharCode: - keycode = K_RIGHTARROW; + case MK_KP6: + keycode = K_KP_6; break; - case kUpArrowCharCode: - keycode = K_UPARROW; + case MK_KP_PLUS: + keycode = K_KP_PLUS; break; - case kDownArrowCharCode : - keycode = K_DOWNARROW; + case MK_KP1: + keycode = K_KP_1; break; - case kDeleteCharCode: - keycode = K_DEL; + case MK_KP2: + keycode = K_KP_2; + break; + case MK_KP3: + keycode = K_KP_3; + break; + case MK_KP_ENTER: + case MK_IBOOK_ENTER: + keycode = K_KP_ENTER; + break; + case MK_KP0: + keycode = K_KP_0; break; - case 0: - case 191: - // characters 0 and 191 are sent by the mouse buttons (?!) + case MK_KP_PERIOD: + keycode = K_KP_PERIOD; break; default: - if ('A' <= charcode && charcode <= 'Z') + switch(charcode) { - keycode = charcode + ('a' - 'A'); // lowercase it - ascii = charcode; - } - else if (charcode >= 32) - { - keycode = charcode; - ascii = charcode; + case kUpArrowCharCode: + keycode = K_UPARROW; + break; + case kLeftArrowCharCode: + keycode = K_LEFTARROW; + break; + case kDownArrowCharCode: + keycode = K_DOWNARROW; + break; + case kRightArrowCharCode: + keycode = K_RIGHTARROW; + break; + case 0: + case 191: + // characters 0 and 191 are sent by the mouse buttons (?!) + break; + default: + if ('A' <= charcode && charcode <= 'Z') + { + keycode = charcode + ('a' - 'A'); // lowercase it + ascii = charcode; + } + else if (charcode >= 32) + { + keycode = charcode; + ascii = charcode; + } + else + Con_Printf(">> UNKNOWN char/keycode: %d/%u <<\n", charcode, (unsigned) mackeycode); } - else - Con_Printf(">> UNKNOWN charcode: %d <<\n", charcode); } if (keycode != 0) @@ -737,28 +914,31 @@ void Sys_SendKeyEvents(void) } default: - Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } } case kEventClassKeyboard: { - char keycode; + char charcode; + UInt32 keycode; switch (eventKind) { case kEventRawKeyDown: - GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(keycode), NULL, &keycode); - Handle_Key(keycode, true); + GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(charcode), NULL, &charcode); + GetEventParameter(theEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(keycode), NULL, &keycode); + Handle_Key(charcode, keycode, true); break; case kEventRawKeyRepeat: break; case kEventRawKeyUp: - GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(keycode), NULL, &keycode); - Handle_Key(keycode, false); + GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(charcode), NULL, &charcode); + GetEventParameter(theEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(keycode), NULL, &keycode); + Handle_Key(charcode, keycode, false); break; case kEventRawKeyModifiersChanged: @@ -779,14 +959,14 @@ void Sys_SendKeyEvents(void) break; default: - Con_Printf (">> kEventClassKeyboard (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf (">> kEventClassKeyboard (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break; } case kEventClassTextInput: - Con_Printf(">> kEventClassTextInput (%d) <<\n", eventKind); + Con_Printf(">> kEventClassTextInput (%d) <<\n", (int)eventKind); break; case kEventClassApplication: @@ -799,12 +979,12 @@ void Sys_SendKeyEvents(void) VID_AppFocusChanged(false); break; case kEventAppQuit: - Sys_Quit(); + Sys_Quit(0); break; case kEventAppActiveWindowChanged: break; default: - Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break; @@ -815,7 +995,7 @@ void Sys_SendKeyEvents(void) case kEventAppleEvent : break; default: - Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break; @@ -826,7 +1006,7 @@ void Sys_SendKeyEvents(void) case kEventWindowUpdate : break; default: - Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break;