mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-10 00:51:35 +00:00
Code Issues Releases Wiki Activity

fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android

Browse source
This commit is contained in:
sylar 2014-10-11 21:21:23 +04:00
parent 3fd10d2a82
commit 964e42ab02
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extern/sdl4ogre/sdlwindowhelper.cpp vendored
View file

@ -27,7 +27,6 @@ SDLWindowHelper::SDLWindowHelper (SDL_Window* window, int w, int h,
throw std::runtime_error("Couldn't get WM Info!"); throw std::runtime_error("Couldn't get WM Info!");
Ogre::String winHandle; Ogre::String winHandle;
Ogre::String winHandleSurface;
switch (wmInfo.subsystem) switch (wmInfo.subsystem)
{ {
@ -46,8 +45,6 @@ SDLWindowHelper::SDLWindowHelper (SDL_Window* window, int w, int h,
#elif ANDROID #elif ANDROID
case SDL_SYSWM_ANDROID: case SDL_SYSWM_ANDROID:
winHandle = Ogre::StringConverter::toString((unsigned long)wmInfo.info.android.window); winHandle = Ogre::StringConverter::toString((unsigned long)wmInfo.info.android.window);
winHandleSurface = Ogre::StringConverter::toString((unsigned long)wmInfo.info.android.surface);
break; break;
#else #else
case SDL_SYSWM_X11: case SDL_SYSWM_X11:
@ -63,7 +60,8 @@ SDLWindowHelper::SDLWindowHelper (SDL_Window* window, int w, int h,
/// to work properly. On Linux/X11 it causes an occasional GLXBadDrawable error. /// to work properly. On Linux/X11 it causes an occasional GLXBadDrawable error.
#ifdef ANDROID #ifdef ANDROID
params.insert(std::make_pair("externalSurface", winHandleSurface)); SDL_GLContext context= SDL_GL_CreateContext(window);
params.insert(std::make_pair("currentGLContext","True"));
#endif #endif
params.insert(std::make_pair("externalWindowHandle", winHandle)); params.insert(std::make_pair("externalWindowHandle", winHandle));