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

Renamed SDL_iPhoneGetViewFramebuffer/Renderbuffer to SDL_iOSGetViewFramebuffer/Renderbuffer. Added #defines for SDL_iOSSetAnimationCallback and SDL_iOSSetEventPump, which point to SDL_iPhoneSetAnimationCallback and SDL_iPhoneSetEventPump.

This commit is contained in:
Alex Szpakowski 2015-04-08 15:59:29 -03:00
parent 1152a75954
commit fcd0f06a88
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/SDL_system.h
View File

@ -73,7 +73,10 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a
/* Platform specific functions for iOS */
#if defined(__IPHONEOS__) && __IPHONEOS__
#define SDL_iOSSetAnimationCallback(window, interval, callback, callbackParam) SDL_iPhoneSetAnimationCallback(window, interval, callback, callbackParam)
extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
#define SDL_iOSSetEventPump(enabled) SDL_iPhoneSetEventPump(enabled)
extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
/**
@ -81,14 +84,14 @@ extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
The Renderbuffer must be bound when calling SDL_GL_SwapWindow.
*/
extern DECLSPEC Uint32 SDLCALL SDL_iPhoneGetViewRenderbuffer(SDL_Window * window);
extern DECLSPEC Uint32 SDLCALL SDL_iOSGetViewRenderbuffer(SDL_Window * window);
/**
\brief Returns the OpenGL Framebuffer Object associated with the window's main view.
The Framebuffer must be bound when rendering to the screen.
*/
extern DECLSPEC Uint32 SDLCALL SDL_iPhoneGetViewFramebuffer(SDL_Window * window);
extern DECLSPEC Uint32 SDLCALL SDL_iOSGetViewFramebuffer(SDL_Window * window);
#endif /* __IPHONEOS__ */

4
src/dynapi/SDL_dynapi_overrides.h
View File

@ -592,5 +592,5 @@
#define SDL_GetQueuedAudioSize SDL_GetQueuedAudioSize_REAL
#define SDL_ClearQueuedAudio SDL_ClearQueuedAudio_REAL
#define SDL_GetGrabbedWindow SDL_GetGrabbedWindow_REAL
#define SDL_iPhoneGetViewRenderbuffer SDL_iPhoneGetViewRenderbuffer_REAL
#define SDL_iPhoneGetViewFramebuffer SDL_iPhoneGetViewFramebuffer_REAL
#define SDL_iOSGetViewRenderbuffer SDL_iOSGetViewRenderbuffer_REAL
#define SDL_iOSGetViewFramebuffer SDL_iOSGetViewFramebuffer_REAL

6
src/dynapi/SDL_dynapi_procs.h
View File

@ -624,5 +624,7 @@ SDL_DYNAPI_PROC(int,SDL_QueueAudio,(SDL_AudioDeviceID a, const void *b, Uint32 c
SDL_DYNAPI_PROC(Uint32,SDL_GetQueuedAudioSize,(SDL_AudioDeviceID a),(a),return)
SDL_DYNAPI_PROC(void,SDL_ClearQueuedAudio,(SDL_AudioDeviceID a),(a),)
SDL_DYNAPI_PROC(SDL_Window*,SDL_GetGrabbedWindow,(void),(),return)
SDL_DYNAPI_PROC(Uint32,SDL_iPhoneGetViewRenderbuffer,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(Uint32,SDL_iPhoneGetViewFramebuffer,(SDL_Window *a),(a),return)
#if defined(__IPHONEOS__) && __IPHONEOS__
SDL_DYNAPI_PROC(Uint32,SDL_iOSGetViewRenderbuffer,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(Uint32,SDL_iOSGetViewFramebuffer,(SDL_Window *a),(a),return)
#endif

4
src/video/uikit/SDL_uikitopengles.m
View File

@ -184,7 +184,7 @@ UIKit_GL_DeleteContext(_THIS, SDL_GLContext context)
}
Uint32
SDL_iPhoneGetViewRenderbuffer(SDL_Window * window)
SDL_iOSGetViewRenderbuffer(SDL_Window * window)
{
if (!window) {
SDL_SetError("Invalid window");
@ -205,7 +205,7 @@ SDL_iPhoneGetViewRenderbuffer(SDL_Window * window)
}
Uint32
SDL_iPhoneGetViewFramebuffer(SDL_Window * window)
SDL_iOSGetViewFramebuffer(SDL_Window * window)
{
if (!window) {
SDL_SetError("Invalid window");