michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Linux: Some DRI drivers don't like to have the context destroyed before the window, even though the context is not current anymore. The destroy ordering in Display.destroy is now flipped as a workaround

This commit is contained in:
Elias Naur 2008-04-13 18:11:38 +00:00
parent b4fe6f6d8d
commit 9aefad3f09
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/java/org/lwjgl/opengl/Display.java
View File

@ -310,13 +310,7 @@ public final class Display {
}
}
private static void destroyWindow() {
if (!window_created) {
return;
}
if (parent != null) {
parent.removeComponentListener(component_listener);
}
private static void releaseDrawable() {
try {
if (context != null && context.isCurrent()) {
Context.releaseCurrentContext();
@ -325,6 +319,16 @@ public final class Display {
} catch (LWJGLException e) {
LWJGLUtil.log("Exception occurred while trying to release context: " + e);
}
}
private static void destroyWindow() {
if (!window_created) {
return;
}
if (parent != null) {
parent.removeComponentListener(component_listener);
}
releaseDrawable();
// Automatically destroy keyboard & mouse
if (Mouse.isCreated()) {
@ -932,8 +936,9 @@ public final class Display {
return;
}
destroyWindow();
releaseDrawable();
destroyContext();
destroyWindow();
destroyPeerInfo();
x = y = -1;
cached_icons = null;