widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

SirVer has proposed merging lp:~widelands-dev/widelands/fix_context_selection into lp:widelands.

Commit message:
On newer libmesa versions, context creation fails if we use SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY). Disabling this *should* still give us a reasonable context (either core, which we need or compatible which will still contain all of what we need + some).

Verified on the server (linux, mesa + xvfb) and on Mac OS and it still does the right thing.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_context_selection/+merge/368238
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_context_selection into lp:widelands.

=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc	2019-05-18 10:47:45 +0000
+++ src/graphic/gl/initialize.cc	2019-06-02 21:23:20 +0000
@@ -46,7 +46,6 @@
 	SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
-	SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
 	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);