forked from SerenityOS/serenity
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ports+LibGL: Replace LibGL context check by ScummVM patch
According to the OpenGL spec, invoking functions without an active context results in undefined behavior. Since ScummVM seems to be the only port having issues with our behavior, patch their code instead.
- Loading branch information
1 parent
3cbf20c
commit a4e2d93
Showing
3 changed files
with
30 additions
and
12 deletions.
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
Ports/scummvm/patches/0001-Prevent-call-to-glGetIntegerv-without-context.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
From c758a59b2b26e3ab22c4fbcba6c83e0b385b86ce Mon Sep 17 00:00:00 2001 | ||
From: Jelle Raaijmakers <[email protected]> | ||
Date: Wed, 12 Jan 2022 13:41:39 +0100 | ||
Subject: [PATCH] Prevent call to `glGetIntegerv` without context | ||
|
||
This call to `SDL_GL_GetAttribute` happens when switching from the | ||
launcher to the game, when no GL context may exist. This caused Grim | ||
Fandango to crash almost immediately. | ||
|
||
Since this is for MSAA which we do not yet support, patch it out. | ||
--- | ||
backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp | ||
index d5c034f..8a4e3ff 100644 | ||
--- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp | ||
+++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp | ||
@@ -185,7 +185,7 @@ void OpenGLSdlGraphics3dManager::setupScreen() { | ||
// (or not bridged in Emscripten?). This forces a windows reset. | ||
currentSamples = -1; | ||
#else | ||
- SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, ¤tSamples); | ||
+ currentSamples = -1; | ||
#endif | ||
|
||
// When rendering to a framebuffer, MSAA is enabled on that framebuffer, not on the screen | ||
-- | ||
2.32.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters