From: huiyu.eun Date: Wed, 12 Jul 2017 01:32:01 +0000 (+0900) Subject: [SDL_Tizen] Delete TIZEN define X-Git-Tag: accepted/tizen/4.0/unified/20170816.012908~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F138338%2F1;p=platform%2Fupstream%2FSDL.git [SDL_Tizen] Delete TIZEN define '__TIZEN__' is not define in SDK. Change-Id: I5c8547ffab1e2644a77781e7b68896561d73c93a Signed-off-by: huiyu.eun --- diff --git a/include/SDL_main.h b/include/SDL_main.h index 91c5b7f..2682323 100644 --- a/include/SDL_main.h +++ b/include/SDL_main.h @@ -156,12 +156,8 @@ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), v #endif /* __WINRT__ */ -#ifdef __TIZEN__ - extern DECLSPEC int SDLCALL SDL_tizen_app_init(int argc, char *argv[]); -#endif /* __TIZEN__ */ - #ifdef __cplusplus } diff --git a/include/SDL_video.h b/include/SDL_video.h index 4c60c27..718ab9a 100755 --- a/include/SDL_video.h +++ b/include/SDL_video.h @@ -193,10 +193,8 @@ typedef enum SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_SHARE_WITH_CURRENT_CONTEXT, SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, - SDL_GL_CONTEXT_RELEASE_BEHAVIOR -#ifdef __TIZEN__ - ,SDL_GL_CONTEXT_PRIORITY -#endif + SDL_GL_CONTEXT_RELEASE_BEHAVIOR, + SDL_GL_CONTEXT_PRIORITY } SDL_GLattr; typedef enum @@ -220,8 +218,6 @@ typedef enum SDL_GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH = 0x0001 } SDL_GLcontextReleaseFlag; - -#ifdef __TIZEN__ typedef enum { SDL_GL_CONTEXT_PRIORITY_NONE = 0x0000, @@ -229,7 +225,6 @@ typedef enum SDL_GL_CONTEXT_PRIORITY_MEDIUM = 0x0002, SDL_GL_CONTEXT_PRIORITY_LOW = 0x0003 } SDL_GLcontextPriorityLevel; -#endif /** * \brief An opaque handle to an Vulkan instance. diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h index fb5bb7f..af04f97 100755 --- a/src/dynapi/SDL_dynapi_procs.h +++ b/src/dynapi/SDL_dynapi_procs.h @@ -631,8 +631,7 @@ SDL_DYNAPI_PROC(int,SDL_GetDisplayDPI,(int a, float *b, float *c, float *d),(a,b SDL_DYNAPI_PROC(SDL_JoystickPowerLevel,SDL_JoystickCurrentPowerLevel,(SDL_Joystick *a),(a),return) SDL_DYNAPI_PROC(SDL_GameController*,SDL_GameControllerFromInstanceID,(SDL_JoystickID a),(a),return) SDL_DYNAPI_PROC(SDL_Joystick*,SDL_JoystickFromInstanceID,(SDL_JoystickID a),(a),return) -#ifdef __TIZEN__ SDL_DYNAPI_PROC(int,SDL_tizen_app_init,(int a, char *b[]),(a,b),return) -#endif + SDL_DYNAPI_PROC(SDL_bool,SDL_Vulkan_GetInstanceExtensions,(SDL_Window* a, unsigned int* b, char** c),(a,b,c),return) SDL_DYNAPI_PROC(SDL_bool,SDL_Vulkan_CreateSurface,(SDL_Window* a, SDL_vulkanInstance b, SDL_vulkanSurface* c),(a,b,c),return)