From b9d905621d71e36ec8f85f924f1973b9a1c8049e Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 18 Mar 2022 15:59:04 -0400 Subject: [PATCH] gpu: remove newt dependency --- .../java/net/runelite/client/plugins/gpu/GpuPlugin.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index 77efae681b..12034c7875 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -26,6 +26,8 @@ package net.runelite.client.plugins.gpu; import com.google.common.primitives.Ints; import com.google.inject.Provides; +import com.jogamp.nativewindow.AbstractGraphicsConfiguration; +import com.jogamp.nativewindow.NativeWindowFactory; import com.jogamp.nativewindow.awt.AWTGraphicsConfiguration; import com.jogamp.nativewindow.awt.JAWTWindow; import com.jogamp.opengl.GL; @@ -64,7 +66,6 @@ import javax.swing.SwingUtilities; import jogamp.nativewindow.SurfaceScaleUtils; import jogamp.nativewindow.jawt.x11.X11JAWTWindow; import jogamp.nativewindow.macosx.OSXUtil; -import jogamp.newt.awt.NewtFactoryAWT; import lombok.extern.slf4j.Slf4j; import net.runelite.api.BufferProvider; import net.runelite.api.Client; @@ -380,7 +381,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks GLCapabilities glCaps = new GLCapabilities(glProfile); AWTGraphicsConfiguration config = AWTGraphicsConfiguration.create(canvas.getGraphicsConfiguration(), glCaps, glCaps); - jawtWindow = NewtFactoryAWT.getNativeWindow(canvas, config); + jawtWindow = (JAWTWindow) NativeWindowFactory.getNativeWindow(canvas, config); canvas.setFocusable(true); GLDrawableFactory glDrawableFactory = GLDrawableFactory.getFactory(glProfile); @@ -547,7 +548,9 @@ public class GpuPlugin extends Plugin implements DrawCallbacks // we'll just leak the window... if (OSType.getOSType() != OSType.MacOS) { - NewtFactoryAWT.destroyNativeWindow(jawtWindow); + final AbstractGraphicsConfiguration config = jawtWindow.getGraphicsConfiguration(); + jawtWindow.destroy(); + config.getScreen().getDevice().close(); } } });