encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-20 02:15:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3513 - SDL_GL_SwapWindow does not return error status

Browse Source 
Return an error code from SDL_GL_SwapWindow(), like the other SDL APIs.
This commit is contained in:
Sam Lantinga
2016-12-09 01:47:43 -08:00
parent 3b18c796ed
commit 524bf3c282
38 changed files with 125 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/haiku/SDL_BWin.h
View File

@@ -668,3 +668,5 @@ private:
* buffer provided by DirectConnected() is invalidated.
*/
#endif
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bclipboard.cc
View File

@@ -93,3 +93,5 @@ SDL_bool BE_HasClipboardText(_THIS) {
#endif
#endif /* SDL_VIDEO_DRIVER_HAIKU */
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bclipboard.h
View File

@@ -29,3 +29,5 @@ extern char *BE_GetClipboardText(_THIS);
extern SDL_bool BE_HasClipboardText(_THIS);
#endif
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bevents.cc
View File

@@ -37,3 +37,5 @@ void BE_PumpEvents(_THIS) {
#endif
#endif /* SDL_VIDEO_DRIVER_HAIKU */
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bevents.h
View File

@@ -35,3 +35,5 @@ extern void BE_PumpEvents(_THIS);
#endif
#endif
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bframebuffer.cc
View File

@@ -252,3 +252,5 @@ int32 BE_UpdateOnce(SDL_Window *window) {
#endif
#endif /* SDL_VIDEO_DRIVER_HAIKU */
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bframebuffer.h
View File

@@ -43,3 +43,5 @@ extern int32 BE_DrawThread(void *data);
#endif
#endif
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bkeyboard.cc
View File

@@ -186,3 +186,5 @@ void BE_SetKeyState(int32 bkey, int8 state) {
#endif
#endif /* SDL_VIDEO_DRIVER_HAIKU */
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bkeyboard.h
View File

@@ -40,3 +40,5 @@ extern void BE_SetKeyState(int32 bkey, int8 state);
#endif
#endif
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bmodes.cc
View File

@@ -329,3 +329,5 @@ int BE_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode){
#endif
#endif /* SDL_VIDEO_DRIVER_HAIKU */
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bmodes.h
View File

@@ -44,3 +44,5 @@ extern int BE_SetDisplayMode(_THIS, SDL_VideoDisplay *display,
#endif
#endif
/* vi: set ts=4 sw=4 expandtab: */

103
src/video/haiku/SDL_bopengl.cc
View File

@@ -38,40 +38,40 @@ extern "C" {
#define BGL_FLAGS BGL_RGB | BGL_DOUBLE
static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
return ((SDL_BWin*)(window->driverdata));
return ((SDL_BWin*)(window->driverdata));
}
static SDL_INLINE SDL_BApp *_GetBeApp() {
return ((SDL_BApp*)be_app);
return ((SDL_BApp*)be_app);
}
/* Passing a NULL path means load pointers from the application */
int BE_GL_LoadLibrary(_THIS, const char *path)
{
/* FIXME: Is this working correctly? */
image_info info;
int32 cookie = 0;
while (get_next_image_info(0, &cookie, &info) == B_OK) {
void *location = NULL;
if( get_image_symbol(info.id, "glBegin", B_SYMBOL_TYPE_ANY,
&location) == B_OK) {
image_info info;
int32 cookie = 0;
while (get_next_image_info(0, &cookie, &info) == B_OK) {
void *location = NULL;
if( get_image_symbol(info.id, "glBegin", B_SYMBOL_TYPE_ANY,
&location) == B_OK) {
_this->gl_config.dll_handle = (void *) info.id;
_this->gl_config.driver_loaded = 1;
SDL_strlcpy(_this->gl_config.driver_path, "libGL.so",
SDL_arraysize(_this->gl_config.driver_path));
}
}
return 0;
_this->gl_config.dll_handle = (void *) info.id;
_this->gl_config.driver_loaded = 1;
SDL_strlcpy(_this->gl_config.driver_path, "libGL.so",
SDL_arraysize(_this->gl_config.driver_path));
}
}
return 0;
}
void *BE_GL_GetProcAddress(_THIS, const char *proc)
{
if (_this->gl_config.dll_handle != NULL) {
void *location = NULL;
status_t err;
if ((err =
get_image_symbol((image_id) _this->gl_config.dll_handle,
if (_this->gl_config.dll_handle != NULL) {
void *location = NULL;
status_t err;
if ((err =
get_image_symbol((image_id) _this->gl_config.dll_handle,
proc, B_SYMBOL_TYPE_ANY,
&location)) == B_OK) {
return location;
@@ -79,52 +79,53 @@ void *BE_GL_GetProcAddress(_THIS, const char *proc)
SDL_SetError("Couldn't find OpenGL symbol");
return NULL;
}
} else {
SDL_SetError("OpenGL library not loaded");
return NULL;
}
} else {
SDL_SetError("OpenGL library not loaded");
return NULL;
}
}
void BE_GL_SwapWindow(_THIS, SDL_Window * window) {
int BE_GL_SwapWindow(_THIS, SDL_Window * window) {
_ToBeWin(window)->SwapBuffers();
return 0;
}
int BE_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) {
_GetBeApp()->SetCurrentContext(((SDL_BWin*)context)->GetGLView());
return 0;
_GetBeApp()->SetCurrentContext(((SDL_BWin*)context)->GetGLView());
return 0;
}
SDL_GLContext BE_GL_CreateContext(_THIS, SDL_Window * window) {
/* FIXME: Not sure what flags should be included here; may want to have
most of them */
SDL_BWin *bwin = _ToBeWin(window);
bwin->CreateGLView(BGL_FLAGS);
return (SDL_GLContext)(bwin);
/* FIXME: Not sure what flags should be included here; may want to have
most of them */
SDL_BWin *bwin = _ToBeWin(window);
bwin->CreateGLView(BGL_FLAGS);
return (SDL_GLContext)(bwin);
}
void BE_GL_DeleteContext(_THIS, SDL_GLContext context) {
/* Currently, automatically unlocks the view */
((SDL_BWin*)context)->RemoveGLView();
/* Currently, automatically unlocks the view */
((SDL_BWin*)context)->RemoveGLView();
}
int BE_GL_SetSwapInterval(_THIS, int interval) {
/* TODO: Implement this, if necessary? */
return 0;
/* TODO: Implement this, if necessary? */
return 0;
}
int BE_GL_GetSwapInterval(_THIS) {
/* TODO: Implement this, if necessary? */
return 0;
/* TODO: Implement this, if necessary? */
return 0;
}
void BE_GL_UnloadLibrary(_THIS) {
/* TODO: Implement this, if necessary? */
/* TODO: Implement this, if necessary? */
}
@@ -132,17 +133,17 @@ void BE_GL_UnloadLibrary(_THIS) {
mode changes (see SDL_bmodes.cc), but it doesn't seem to help, and is not
currently in use. */
void BE_GL_RebootContexts(_THIS) {
SDL_Window *window = _this->windows;
while(window) {
SDL_BWin *bwin = _ToBeWin(window);
if(bwin->GetGLView()) {
bwin->LockLooper();
bwin->RemoveGLView();
bwin->CreateGLView(BGL_FLAGS);
bwin->UnlockLooper();
}
window = window->next;
}
SDL_Window *window = _this->windows;
while(window) {
SDL_BWin *bwin = _ToBeWin(window);
if(bwin->GetGLView()) {
bwin->LockLooper();
bwin->RemoveGLView();
bwin->CreateGLView(BGL_FLAGS);
bwin->UnlockLooper();
}
window = window->next;
}
}
@@ -217,3 +218,5 @@ void BE_GL_RebootContexts(_THIS) {
#endif
#endif /* SDL_VIDEO_DRIVER_HAIKU */
/* vi: set ts=4 sw=4 expandtab: */

4
src/video/haiku/SDL_bopengl.h
View File

@@ -36,7 +36,7 @@ extern int BE_GL_MakeCurrent(_THIS, SDL_Window * window,
SDL_GLContext context);
extern int BE_GL_SetSwapInterval(_THIS, int interval); /* TODO */
extern int BE_GL_GetSwapInterval(_THIS); /* TODO */
extern void BE_GL_SwapWindow(_THIS, SDL_Window * window);
extern int BE_GL_SwapWindow(_THIS, SDL_Window * window);
extern SDL_GLContext BE_GL_CreateContext(_THIS, SDL_Window * window);
extern void BE_GL_DeleteContext(_THIS, SDL_GLContext context);
@@ -47,3 +47,5 @@ extern void BE_GL_RebootContexts(_THIS);
#endif
#endif
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bvideo.cc
View File

@@ -173,3 +173,5 @@ void BE_VideoQuit(_THIS)
#endif
#endif /* SDL_VIDEO_DRIVER_HAIKU */
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bvideo.h
View File

@@ -40,3 +40,5 @@ extern int BE_Available(void);
#endif
#endif
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/haiku/SDL_bwindow.cc
View File

@@ -227,3 +227,5 @@ SDL_bool BE_GetWindowWMInfo(_THIS, SDL_Window * window,
#endif
#endif /* SDL_VIDEO_DRIVER_HAIKU */
/* vi: set ts=4 sw=4 expandtab: */

1
src/video/haiku/SDL_bwindow.h
View File

@@ -52,3 +52,4 @@ extern SDL_bool BE_GetWindowWMInfo(_THIS, SDL_Window * window,
#endif
/* vi: set ts=4 sw=4 expandtab: */