Renamed SDL_iPhoneGetViewFramebuffer/Renderbuffer to SDL_iOSGetViewFramebuffer/Renderbuffer. Added #defines for SDL_iOSSetAnimationCallback and SDL_iOSSetEventPump, which point to SDL_iPhoneSetAnimationCallback and SDL_iPhoneSetEventPump. iOS-improvements
authorAlex Szpakowski <slime73@gmail.com>
Wed, 08 Apr 2015 15:59:29 -0300
branchiOS-improvements
changeset 9539ea3513fe64a0
parent 9538 3f4340777b65
child 9540 32ddc92d78cf
Renamed SDL_iPhoneGetViewFramebuffer/Renderbuffer to SDL_iOSGetViewFramebuffer/Renderbuffer. Added #defines for SDL_iOSSetAnimationCallback and SDL_iOSSetEventPump, which point to SDL_iPhoneSetAnimationCallback and SDL_iPhoneSetEventPump.
include/SDL_system.h
src/dynapi/SDL_dynapi_overrides.h
src/dynapi/SDL_dynapi_procs.h
src/video/uikit/SDL_uikitopengles.m
     1.1 --- a/include/SDL_system.h	Wed Apr 08 15:44:07 2015 -0300
     1.2 +++ b/include/SDL_system.h	Wed Apr 08 15:59:29 2015 -0300
     1.3 @@ -73,7 +73,10 @@
     1.4  /* Platform specific functions for iOS */
     1.5  #if defined(__IPHONEOS__) && __IPHONEOS__
     1.6  
     1.7 +#define SDL_iOSSetAnimationCallback(window, interval, callback, callbackParam) SDL_iPhoneSetAnimationCallback(window, interval, callback, callbackParam)
     1.8  extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
     1.9 +
    1.10 +#define SDL_iOSSetEventPump(enabled) SDL_iPhoneSetEventPump(enabled)
    1.11  extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
    1.12  
    1.13  /**
    1.14 @@ -81,14 +84,14 @@
    1.15  
    1.16     The Renderbuffer must be bound when calling SDL_GL_SwapWindow.
    1.17   */
    1.18 -extern DECLSPEC Uint32 SDLCALL SDL_iPhoneGetViewRenderbuffer(SDL_Window * window);
    1.19 +extern DECLSPEC Uint32 SDLCALL SDL_iOSGetViewRenderbuffer(SDL_Window * window);
    1.20  
    1.21  /**
    1.22     \brief Returns the OpenGL Framebuffer Object associated with the window's main view.
    1.23  
    1.24     The Framebuffer must be bound when rendering to the screen.
    1.25   */
    1.26 -extern DECLSPEC Uint32 SDLCALL SDL_iPhoneGetViewFramebuffer(SDL_Window * window);
    1.27 +extern DECLSPEC Uint32 SDLCALL SDL_iOSGetViewFramebuffer(SDL_Window * window);
    1.28  
    1.29  #endif /* __IPHONEOS__ */
    1.30  
     2.1 --- a/src/dynapi/SDL_dynapi_overrides.h	Wed Apr 08 15:44:07 2015 -0300
     2.2 +++ b/src/dynapi/SDL_dynapi_overrides.h	Wed Apr 08 15:59:29 2015 -0300
     2.3 @@ -592,5 +592,5 @@
     2.4  #define SDL_GetQueuedAudioSize SDL_GetQueuedAudioSize_REAL
     2.5  #define SDL_ClearQueuedAudio SDL_ClearQueuedAudio_REAL
     2.6  #define SDL_GetGrabbedWindow SDL_GetGrabbedWindow_REAL
     2.7 -#define SDL_iPhoneGetViewRenderbuffer SDL_iPhoneGetViewRenderbuffer_REAL
     2.8 -#define SDL_iPhoneGetViewFramebuffer SDL_iPhoneGetViewFramebuffer_REAL
     2.9 +#define SDL_iOSGetViewRenderbuffer SDL_iOSGetViewRenderbuffer_REAL
    2.10 +#define SDL_iOSGetViewFramebuffer SDL_iOSGetViewFramebuffer_REAL
     3.1 --- a/src/dynapi/SDL_dynapi_procs.h	Wed Apr 08 15:44:07 2015 -0300
     3.2 +++ b/src/dynapi/SDL_dynapi_procs.h	Wed Apr 08 15:59:29 2015 -0300
     3.3 @@ -624,5 +624,7 @@
     3.4  SDL_DYNAPI_PROC(Uint32,SDL_GetQueuedAudioSize,(SDL_AudioDeviceID a),(a),return)
     3.5  SDL_DYNAPI_PROC(void,SDL_ClearQueuedAudio,(SDL_AudioDeviceID a),(a),)
     3.6  SDL_DYNAPI_PROC(SDL_Window*,SDL_GetGrabbedWindow,(void),(),return)
     3.7 -SDL_DYNAPI_PROC(Uint32,SDL_iPhoneGetViewRenderbuffer,(SDL_Window *a),(a),return)
     3.8 -SDL_DYNAPI_PROC(Uint32,SDL_iPhoneGetViewFramebuffer,(SDL_Window *a),(a),return)
     3.9 +#if defined(__IPHONEOS__) && __IPHONEOS__
    3.10 +SDL_DYNAPI_PROC(Uint32,SDL_iOSGetViewRenderbuffer,(SDL_Window *a),(a),return)
    3.11 +SDL_DYNAPI_PROC(Uint32,SDL_iOSGetViewFramebuffer,(SDL_Window *a),(a),return)
    3.12 +#endif
     4.1 --- a/src/video/uikit/SDL_uikitopengles.m	Wed Apr 08 15:44:07 2015 -0300
     4.2 +++ b/src/video/uikit/SDL_uikitopengles.m	Wed Apr 08 15:59:29 2015 -0300
     4.3 @@ -184,7 +184,7 @@
     4.4  }
     4.5  
     4.6  Uint32
     4.7 -SDL_iPhoneGetViewRenderbuffer(SDL_Window * window)
     4.8 +SDL_iOSGetViewRenderbuffer(SDL_Window * window)
     4.9  {
    4.10      if (!window) {
    4.11          SDL_SetError("Invalid window");
    4.12 @@ -205,7 +205,7 @@
    4.13  }
    4.14  
    4.15  Uint32
    4.16 -SDL_iPhoneGetViewFramebuffer(SDL_Window * window)
    4.17 +SDL_iOSGetViewFramebuffer(SDL_Window * window)
    4.18  {
    4.19      if (!window) {
    4.20          SDL_SetError("Invalid window");