Mercurial > sdl-ios-xcode
annotate src/video/maccommon/SDL_macgl.c @ 967:cda407d627a3
Date: Tue, 5 Oct 2004 11:04:02 -0400
From: Bob Ippolito
Subject: [SDL] PATCH: Fix for release count bug in SDL_QuartzWM
SDL_QuartzWM incorrectly does [window close]; [window release];
The semantics for -[NSWindow close] are as follows:
Removes the receiver from the screen. If the receiver is set to be
released when closed, a release message is sent to the object after the
current event is completed. For an NSWindow object, the default is to
be released on closing, while for an NSPanel object, the default is not
to be released. You can use the setReleasedWhenClosed: method to change
the default behavior.
This patch simply removes the incorrect release.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Fri, 12 Nov 2004 21:29:52 +0000 |
| parents | 0c3e00cc9580 |
| children | c9b51268668f |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
706
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 /* AGL implementation of SDL OpenGL support */ | |
| 29 | |
| 30 #include "SDL_error.h" | |
| 31 #include "SDL_lowvideo.h" | |
| 32 #include "SDL_macgl_c.h" | |
|
774
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
33 #include "SDL_loadso.h" |
| 0 | 34 |
| 35 | |
| 36 /* krat: adding OpenGL support */ | |
| 37 int Mac_GL_Init(_THIS) | |
| 38 { | |
| 39 #ifdef HAVE_OPENGL | |
| 40 AGLPixelFormat format; | |
| 41 int i = 0; | |
| 42 GLint attributes [ 24 ]; /* 24 is max possible in this setup */ | |
| 43 GLboolean noerr; | |
| 44 | |
| 45 attributes[i++] = AGL_RGBA; | |
| 46 if ( this->gl_config.red_size != 0 && | |
| 47 this->gl_config.blue_size != 0 && | |
| 48 this->gl_config.green_size != 0 ) { | |
| 49 attributes[i++] = AGL_RED_SIZE; | |
| 50 attributes[i++] = this->gl_config.red_size; | |
| 51 attributes[i++] = AGL_GREEN_SIZE; | |
| 52 attributes[i++] = this->gl_config.green_size; | |
| 53 attributes[i++] = AGL_BLUE_SIZE; | |
| 54 attributes[i++] = this->gl_config.blue_size; | |
| 55 attributes[i++] = AGL_ALPHA_SIZE; | |
| 56 attributes[i++] = this->gl_config.alpha_size; | |
| 57 } | |
|
706
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
58 if ( this->gl_config.double_buffer ) { |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
59 attributes[i++] = AGL_DOUBLEBUFFER; |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
60 } |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
61 if ( this->gl_config.depth_size != 0 ) { |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
62 attributes[i++] = AGL_DEPTH_SIZE; |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
63 attributes[i++] = this->gl_config.depth_size; |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
64 } |
| 0 | 65 if ( this->gl_config.stencil_size != 0 ) { |
| 66 attributes[i++] = AGL_STENCIL_SIZE; | |
| 67 attributes[i++] = this->gl_config.stencil_size; | |
| 68 } | |
| 69 if ( this->gl_config.accum_red_size != 0 && | |
| 70 this->gl_config.accum_blue_size != 0 && | |
| 71 this->gl_config.accum_green_size != 0 ) { | |
| 72 | |
| 73 attributes[i++] = AGL_ACCUM_RED_SIZE; | |
| 74 attributes[i++] = this->gl_config.accum_red_size; | |
| 75 attributes[i++] = AGL_ACCUM_GREEN_SIZE; | |
| 76 attributes[i++] = this->gl_config.accum_green_size; | |
| 77 attributes[i++] = AGL_ACCUM_BLUE_SIZE; | |
| 78 attributes[i++] = this->gl_config.accum_blue_size; | |
| 79 attributes[i++] = AGL_ACCUM_ALPHA_SIZE; | |
| 80 attributes[i++] = this->gl_config.accum_alpha_size; | |
| 81 } | |
|
706
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
82 if ( this->gl_config.stereo ) { |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
83 attributes[i++] = AGL_STEREO; |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
84 } |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
85 #if defined(AGL_SAMPLE_BUFFERS_ARB) && defined(AGL_SAMPLES_ARB) |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
86 if ( this->gl_config.multisamplebuffers != 0 ) { |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
87 attributes[i++] = AGL_SAMPLE_BUFFERS_ARB; |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
88 attributes[i++] = this->gl_config.multisamplebuffers; |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
89 } |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
90 if ( this->gl_config.multisamplesamples != 0 ) { |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
91 attributes[i++] = AGL_SAMPLES_ARB; |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
92 attributes[i++] = this->gl_config.multisamplesamples; |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
93 } |
|
a33b7819b917
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
656
diff
changeset
|
94 #endif |
| 0 | 95 attributes[i++] = AGL_ALL_RENDERERS; |
| 96 attributes[i] = AGL_NONE; | |
| 97 | |
| 98 format = aglChoosePixelFormat(NULL, 0, attributes); | |
| 99 if ( format == NULL ) { | |
| 100 SDL_SetError("Couldn't match OpenGL desired format"); | |
| 101 return(-1); | |
| 102 } | |
| 103 | |
| 104 glContext = aglCreateContext(format, NULL); | |
| 105 if ( glContext == NULL ) { | |
| 106 SDL_SetError("Couldn't create OpenGL context"); | |
| 107 return(-1); | |
| 108 } | |
| 109 aglDestroyPixelFormat(format); | |
| 110 | |
| 111 #if TARGET_API_MAC_CARBON | |
| 112 noerr = aglSetDrawable(glContext, GetWindowPort(SDL_Window)); | |
| 113 #else | |
| 114 noerr = aglSetDrawable(glContext, (AGLDrawable)SDL_Window); | |
| 115 #endif | |
| 116 | |
| 117 if(!noerr) { | |
| 118 SDL_SetError("Unable to bind GL context to window"); | |
| 119 return(-1); | |
| 120 } | |
| 121 return(0); | |
| 122 #else | |
| 123 SDL_SetError("OpenGL support not configured"); | |
| 124 return(-1); | |
| 125 #endif | |
| 126 } | |
| 127 | |
| 128 void Mac_GL_Quit(_THIS) | |
| 129 { | |
| 130 #ifdef HAVE_OPENGL | |
| 131 if ( glContext != NULL ) { | |
| 132 aglSetCurrentContext(NULL); | |
| 133 aglSetDrawable(glContext, NULL); | |
| 134 aglDestroyContext(glContext); | |
| 135 glContext = NULL; | |
| 136 } | |
| 137 #endif | |
| 138 } | |
| 139 | |
| 140 #ifdef HAVE_OPENGL | |
| 141 | |
| 142 /* Make the current context active */ | |
| 143 int Mac_GL_MakeCurrent(_THIS) | |
| 144 { | |
| 145 int retval; | |
| 146 | |
| 147 retval = 0; | |
| 148 if( ! aglSetCurrentContext(glContext) ) { | |
| 149 SDL_SetError("Unable to make GL context current"); | |
| 150 retval = -1; | |
| 151 } | |
| 152 return(retval); | |
| 153 } | |
| 154 | |
| 155 void Mac_GL_SwapBuffers(_THIS) | |
| 156 { | |
| 157 aglSwapBuffers(glContext); | |
| 158 } | |
| 159 | |
|
774
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
160 int Mac_GL_LoadLibrary(_THIS, const char *location) |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
161 { |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
162 if (location == NULL) |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
163 location = "OpenGLLibrary"; |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
164 |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
165 this->hidden->libraryHandle = SDL_LoadObject(location); |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
166 |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
167 this->gl_config.driver_loaded = 1; |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
168 return (this->hidden->libraryHandle != NULL) ? 0 : -1; |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
169 } |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
170 |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
171 void Mac_GL_UnloadLibrary(_THIS) |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
172 { |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
173 SDL_UnloadObject(this->hidden->libraryHandle); |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
174 |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
175 this->hidden->libraryHandle = NULL; |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
176 this->gl_config.driver_loaded = 0; |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
177 } |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
178 |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
179 void* Mac_GL_GetProcAddress(_THIS, const char *proc) |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
180 { |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
181 return SDL_LoadFunction( this->hidden->libraryHandle, proc ); |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
182 } |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
183 |
| 0 | 184 #endif /* HAVE_OPENGL */ |
| 185 |