gpu: remove newt dependency
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user