Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Check for a validly mapped OpenGL screen buffer during driver init. #9007

Merged
merged 1 commit into from Apr 11, 2021

Conversation

michicc
Copy link
Member

@michicc michicc commented Apr 10, 2021

Motivation / Problem

There's some unknown issue during bootstrap that causes a crash due to a an invalid screen pointer (see #8967 and #8969). The exact cause is unknown, but video driver init on SDL/Win32 doesn't check for a validly mapped buffer before suggesting success.

Description

Check for valid mapping on Init, rejecting the OGL driver if not valid and falling back to the next driver.

Limitations

If it is indeed the buffer mapping that fails, this would be a work-around. It is not fixing the real bug in this case though, as there's some underlying reason why the mapping fails.
If the issue is something else, this PR might simply not do anything.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label Apr 11, 2021
@michicc michicc merged commit 5644c00 into OpenTTD:master Apr 11, 2021
@michicc michicc deleted the pr/maybe_fix_ogl_buffer branch April 11, 2021 12:28
@LordAro
Copy link
Member

LordAro commented Apr 11, 2021

Indeed so, latest nightly (20210411) should include this fix

Note that it doesn't actually fix whatever underlying issue you have, but should hopefully prevent the game from crashing (and fallback to software rendering instead)

LordAro pushed a commit to LordAro/OpenTTD that referenced this pull request Apr 17, 2021
@LordAro LordAro added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Apr 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants