TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-17 08:35:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE on SharedDrawable

Browse Source
This commit is contained in:
khanhduytran0 2021-02-20 12:24:20 +07:00
parent 2137796aaa
commit 6957bcff4a
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/Display.java
View File

@ -61,7 +61,7 @@ public class Display {
private static boolean window_created; private static boolean window_created;
/** The Drawable instance that tracks the current Display context */ /** The Drawable instance that tracks the current Display context */
private static volatile DrawableLWJGL drawable; private static volatile DrawableLWJGL drawable = null;
private static Canvas parent; private static Canvas parent;
@ -206,30 +206,13 @@ public class Display {
// System.out.println("TODO: Implement Display.create(PixelFormat, // System.out.println("TODO: Implement Display.create(PixelFormat,
// Drawable)"); // TODO // Drawable)"); // TODO
create(pixel_format); create(pixel_format);
final DrawableGL drawable = new DrawableGL() {
public void destroy() {
synchronized ( GlobalLock.lock ) {
if ( !isCreated() )
return;
releaseDrawable();
super.destroy();
destroyWindow();
// x = y = -1;
// cached_icons = null;
reset();
}
}
};
Display.drawable = drawable;
try { try {
drawable.setPixelFormat(pixel_format, null); drawable.setPixelFormat(pixel_format, null);
try { try {
createWindow(); createWindow();
try { try {
drawable.context = new ContextGL(drawable.peer_info, null /* attribs */, shared_drawable != null ? ((DrawableGL)shared_drawable).getContext() : null); ((DrawableGL) drawable).context = new ContextGL(((DrawableGL) drawable).peer_info, null /* attribs */, shared_drawable != null ? ((DrawableGL)shared_drawable).getContext() : null);
try { try {
makeCurrentAndSetSwapInterval(); makeCurrentAndSetSwapInterval();
initContext(); initContext();
@ -731,6 +714,24 @@ public class Display {
} }
}; };
final DrawableGL drawable = new DrawableGL() {
public void destroy() {
synchronized ( GlobalLock.lock ) {
if ( !isCreated() )
return;
releaseDrawable();
super.destroy();
destroyWindow();
// x = y = -1;
// cached_icons = null;
reset();
}
}
};
drawable.context = new ContextGL(null, null, null);
Display.drawable = drawable;
displayCreated = true; displayCreated = true;