Merge lp:~widelands-dev/widelands/fix_context_selection into lp:widelands

Proposed by SirVer
Status: Merged
Merged at revision: 9140
Proposed branch: lp:~widelands-dev/widelands/fix_context_selection
Merge into: lp:widelands
Diff against target: 10 lines (+0/-1)
1 file modified
src/graphic/gl/initialize.cc (+0/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/fix_context_selection
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+368238@code.launchpad.net

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.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5138. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/540496020.
Appveyor build 4920. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_context_selection-4920.

9137. By GunChleoc

Merged trunk.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5140. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/540645510.
Appveyor build 4922. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_context_selection-4922.

Revision history for this message
kaputtnik (franku) wrote :

Should this be tested some how or are the Travis/Appveyor builds enough testing?

Revision history for this message
GunChleoc (gunchleoc) wrote :

Tested on 2 Linux and 1 Windows machines. I'll merge this now, because it seems to be OK.

@kaputtnik: Can you test with your old laptop some time too, just in case?

@bunnybot merge

review: Approve
Revision history for this message
kaputtnik (franku) wrote :

Will do next weekend :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/graphic/gl/initialize.cc'
2--- src/graphic/gl/initialize.cc 2019-05-18 10:47:45 +0000
3+++ src/graphic/gl/initialize.cc 2019-06-03 08:29:33 +0000
4@@ -46,7 +46,6 @@
5 SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
6 SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
7 SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
8- SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
9 SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
10 SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
11

Subscribers

People subscribed via source and target branches

to status/vote changes: