Merge "[SDL_Tizen]Add SDL_SetWindowBordered function" into tizen
authorhuiyu.eun <huiyu.eun@samsung.com>
Thu, 22 Dec 2016 12:59:11 +0000 (04:59 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 22 Dec 2016 12:59:06 +0000 (04:59 -0800)
1  2 
src/core/tizen/SDL_tizen.c
src/video/tizen/SDL_tizenopengles.c
src/video/tizen/SDL_tizenwindow.c

Simple merge
@@@ -60,12 -60,9 +60,9 @@@ Tizen_GLES_CreateContext(_THIS, SDL_Win
  
      if(!(window->flags & SDL_WINDOW_FULLSCREEN) && !(window->flags & SDL_WINDOW_BORDERLESS))
      {
-         SDL_VideoData *data = (SDL_VideoData *) (SDL_GetVideoDevice()->driverdata);
-         if(data->current_thread != SDL_GetThreadID(0))
-             return context;
          if(!Tizen_Indicator_GLES_Init(window))
          {
 -            SDL_Log("Indicator GLES init error!");
 +            SDL_LogError(SDL_LOG_CATEGORY_ASSERT, "Indicator GLES init error!");
          }
      }
  
Simple merge