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

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

Commit message

Flush pipeline before switching bound framebuffer to work around buggy OpenGL implementations.

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

I bow to your sleuthing skills :)

Let's merge one Travis comes through.

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 1306. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/157819637.
Appveyor build 1148. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_font_rendering_bug-1148.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/graphic/gl/utils.cc'
2--- src/graphic/gl/utils.cc 2016-08-04 15:49:05 +0000
3+++ src/graphic/gl/utils.cc 2016-09-06 08:04:16 +0000
4@@ -220,6 +220,11 @@
5 return;
6 }
7
8+ // Some graphic drivers inaccurately do not flush their pipeline when
9+ // switching the framebuffer - and happily do draw calls into the wrong
10+ // framebuffers. I AM LOOKING AT YOU, INTEL!!!
11+ glFlush();
12+
13 glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
14 if (framebuffer != 0) {
15 unbind_texture_if_bound(texture);

Subscribers

People subscribed via source and target branches

to status/vote changes: