encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a bunch of SwapWindow calls that needed their return value updated

This commit is contained in:
Sam Lantinga 2016-12-09 05:12:27 -08:00
parent 7a39681ea5
commit 97d05b0da8
13 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/android/SDL_androidgl.c
View File

@ -39,7 +39,7 @@
SDL_EGL_CreateContext_impl(Android) SDL_EGL_CreateContext_impl(Android)
SDL_EGL_MakeCurrent_impl(Android) SDL_EGL_MakeCurrent_impl(Android)
void int
Android_GLES_SwapWindow(_THIS, SDL_Window * window) Android_GLES_SwapWindow(_THIS, SDL_Window * window)
{ {
/* The following two calls existed in the original Java code /* The following two calls existed in the original Java code
@ -49,7 +49,7 @@ Android_GLES_SwapWindow(_THIS, SDL_Window * window)
/*_this->egl_data->eglWaitNative(EGL_CORE_NATIVE_ENGINE); /*_this->egl_data->eglWaitNative(EGL_CORE_NATIVE_ENGINE);
_this->egl_data->eglWaitGL();*/ _this->egl_data->eglWaitGL();*/
SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface); return SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);
} }
int int

2
src/video/android/SDL_androidgl.h
View File

@ -25,7 +25,7 @@
SDL_GLContext Android_GLES_CreateContext(_THIS, SDL_Window * window); SDL_GLContext Android_GLES_CreateContext(_THIS, SDL_Window * window);
int Android_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); int Android_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
void Android_GLES_SwapWindow(_THIS, SDL_Window * window); int Android_GLES_SwapWindow(_THIS, SDL_Window * window);
int Android_GLES_LoadLibrary(_THIS, const char *path); int Android_GLES_LoadLibrary(_THIS, const char *path);

2
src/video/emscripten/SDL_emscriptenopengles.h
View File

@ -38,7 +38,7 @@
extern int Emscripten_GLES_LoadLibrary(_THIS, const char *path); extern int Emscripten_GLES_LoadLibrary(_THIS, const char *path);
extern void Emscripten_GLES_DeleteContext(_THIS, SDL_GLContext context); extern void Emscripten_GLES_DeleteContext(_THIS, SDL_GLContext context);
extern SDL_GLContext Emscripten_GLES_CreateContext(_THIS, SDL_Window * window); extern SDL_GLContext Emscripten_GLES_CreateContext(_THIS, SDL_Window * window);
extern void Emscripten_GLES_SwapWindow(_THIS, SDL_Window * window); extern int Emscripten_GLES_SwapWindow(_THIS, SDL_Window * window);
extern int Emscripten_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); extern int Emscripten_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
extern void Emscripten_GLES_GetDrawableSize(_THIS, SDL_Window * window, int * w, int * h); extern void Emscripten_GLES_GetDrawableSize(_THIS, SDL_Window * window, int * w, int * h);

7
src/video/nacl/SDL_naclopengles.c
View File

@ -151,12 +151,15 @@ NACL_GLES_GetSwapInterval(_THIS)
return 0; return 0;
} }
void int
NACL_GLES_SwapWindow(_THIS, SDL_Window * window) NACL_GLES_SwapWindow(_THIS, SDL_Window * window)
{ {
SDL_VideoData *driverdata = (SDL_VideoData *) _this->driverdata; SDL_VideoData *driverdata = (SDL_VideoData *) _this->driverdata;
struct PP_CompletionCallback callback = { NULL, 0, PP_COMPLETIONCALLBACK_FLAG_NONE }; struct PP_CompletionCallback callback = { NULL, 0, PP_COMPLETIONCALLBACK_FLAG_NONE };
driverdata->ppb_graphics->SwapBuffers((PP_Resource) SDL_GL_GetCurrentContext(), callback ); if (driverdata->ppb_graphics->SwapBuffers((PP_Resource) SDL_GL_GetCurrentContext(), callback ) != PP_OK) {
return SDL_SetError("SwapBuffers failed");
}
return 0;
} }
void void

2
src/video/nacl/SDL_naclopengles.h
View File

@ -30,7 +30,7 @@ extern SDL_GLContext NACL_GLES_CreateContext(_THIS, SDL_Window * window);
extern int NACL_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); extern int NACL_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
extern int NACL_GLES_SetSwapInterval(_THIS, int interval); extern int NACL_GLES_SetSwapInterval(_THIS, int interval);
extern int NACL_GLES_GetSwapInterval(_THIS); extern int NACL_GLES_GetSwapInterval(_THIS);
extern void NACL_GLES_SwapWindow(_THIS, SDL_Window * window); extern int NACL_GLES_SwapWindow(_THIS, SDL_Window * window);
extern void NACL_GLES_DeleteContext(_THIS, SDL_GLContext context); extern void NACL_GLES_DeleteContext(_THIS, SDL_GLContext context);
#endif /* _SDL_naclgl_h */ #endif /* _SDL_naclgl_h */

4
src/video/psp/SDL_pspgl.c
View File

@ -177,7 +177,9 @@ PSP_GL_GetSwapInterval(_THIS)
int int
PSP_GL_SwapWindow(_THIS, SDL_Window * window) PSP_GL_SwapWindow(_THIS, SDL_Window * window)
{ {
eglSwapBuffers(_this->gl_data->display, _this->gl_data->surface); if (!eglSwapBuffers(_this->gl_data->display, _this->gl_data->surface)) {
return SDL_SetError("!eglSwapBuffers() failed");
}
return 0; return 0;
} }

2
src/video/raspberry/SDL_rpiopengles.h
View File

@ -38,7 +38,7 @@
extern int RPI_GLES_LoadLibrary(_THIS, const char *path); extern int RPI_GLES_LoadLibrary(_THIS, const char *path);
extern SDL_GLContext RPI_GLES_CreateContext(_THIS, SDL_Window * window); extern SDL_GLContext RPI_GLES_CreateContext(_THIS, SDL_Window * window);
extern void RPI_GLES_SwapWindow(_THIS, SDL_Window * window); extern int RPI_GLES_SwapWindow(_THIS, SDL_Window * window);
extern int RPI_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); extern int RPI_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
#endif /* SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL */ #endif /* SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL */

2
src/video/raspberry/SDL_rpivideo.h
View File

@ -90,7 +90,7 @@ SDL_GLContext RPI_GLES_CreateContext(_THIS, SDL_Window * window);
int RPI_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); int RPI_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
int RPI_GLES_SetSwapInterval(_THIS, int interval); int RPI_GLES_SetSwapInterval(_THIS, int interval);
int RPI_GLES_GetSwapInterval(_THIS); int RPI_GLES_GetSwapInterval(_THIS);
void RPI_GLES_SwapWindow(_THIS, SDL_Window * window); int RPI_GLES_SwapWindow(_THIS, SDL_Window * window);
void RPI_GLES_DeleteContext(_THIS, SDL_GLContext context); void RPI_GLES_DeleteContext(_THIS, SDL_GLContext context);
#endif /* __SDL_RPIVIDEO_H__ */ #endif /* __SDL_RPIVIDEO_H__ */

2
src/video/vivante/SDL_vivanteopengles.h
View File

@ -38,7 +38,7 @@
extern int VIVANTE_GLES_LoadLibrary(_THIS, const char *path); extern int VIVANTE_GLES_LoadLibrary(_THIS, const char *path);
extern SDL_GLContext VIVANTE_GLES_CreateContext(_THIS, SDL_Window * window); extern SDL_GLContext VIVANTE_GLES_CreateContext(_THIS, SDL_Window * window);
extern void VIVANTE_GLES_SwapWindow(_THIS, SDL_Window * window); extern int VIVANTE_GLES_SwapWindow(_THIS, SDL_Window * window);
extern int VIVANTE_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); extern int VIVANTE_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
#endif /* SDL_VIDEO_DRIVER_VIVANTE && SDL_VIDEO_OPENGL_EGL */ #endif /* SDL_VIDEO_DRIVER_VIVANTE && SDL_VIDEO_OPENGL_EGL */

8
src/video/wayland/SDL_waylandopengles.c
View File

@ -54,14 +54,16 @@ Wayland_GLES_CreateContext(_THIS, SDL_Window * window)
return context; return context;
} }
void int
Wayland_GLES_SwapWindow(_THIS, SDL_Window *window) Wayland_GLES_SwapWindow(_THIS, SDL_Window *window)
{ {
SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface); if (SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface) < 0) {
return -1;
}
WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display ); WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display );
return 0;
} }
int int
Wayland_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) Wayland_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
{ {

2
src/video/wayland/SDL_waylandopengles.h
View File

@ -39,7 +39,7 @@ typedef struct SDL_PrivateGLESData
extern int Wayland_GLES_LoadLibrary(_THIS, const char *path); extern int Wayland_GLES_LoadLibrary(_THIS, const char *path);
extern SDL_GLContext Wayland_GLES_CreateContext(_THIS, SDL_Window * window); extern SDL_GLContext Wayland_GLES_CreateContext(_THIS, SDL_Window * window);
extern void Wayland_GLES_SwapWindow(_THIS, SDL_Window * window); extern int Wayland_GLES_SwapWindow(_THIS, SDL_Window * window);
extern int Wayland_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); extern int Wayland_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
extern void Wayland_GLES_DeleteContext(_THIS, SDL_GLContext context); extern void Wayland_GLES_DeleteContext(_THIS, SDL_GLContext context);

2
src/video/windows/SDL_windowsopengles.h
View File

@ -39,7 +39,7 @@ extern int WIN_GLES_SetSwapInterval(_THIS, int interval);
extern int WIN_GLES_LoadLibrary(_THIS, const char *path); extern int WIN_GLES_LoadLibrary(_THIS, const char *path);
extern SDL_GLContext WIN_GLES_CreateContext(_THIS, SDL_Window * window); extern SDL_GLContext WIN_GLES_CreateContext(_THIS, SDL_Window * window);
extern void WIN_GLES_SwapWindow(_THIS, SDL_Window * window); extern int WIN_GLES_SwapWindow(_THIS, SDL_Window * window);
extern int WIN_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); extern int WIN_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
extern void WIN_GLES_DeleteContext(_THIS, SDL_GLContext context); extern void WIN_GLES_DeleteContext(_THIS, SDL_GLContext context);
extern int WIN_GLES_SetupWindow(_THIS, SDL_Window * window); extern int WIN_GLES_SetupWindow(_THIS, SDL_Window * window);

2
src/video/winrt/SDL_winrtopengles.h
View File

@ -38,7 +38,7 @@
extern int WINRT_GLES_LoadLibrary(_THIS, const char *path); extern int WINRT_GLES_LoadLibrary(_THIS, const char *path);
extern void WINRT_GLES_UnloadLibrary(_THIS); extern void WINRT_GLES_UnloadLibrary(_THIS);
extern SDL_GLContext WINRT_GLES_CreateContext(_THIS, SDL_Window * window); extern SDL_GLContext WINRT_GLES_CreateContext(_THIS, SDL_Window * window);
extern void WINRT_GLES_SwapWindow(_THIS, SDL_Window * window); extern int WINRT_GLES_SwapWindow(_THIS, SDL_Window * window);
extern int WINRT_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); extern int WINRT_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);