ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix GPU rendering on Linux

Browse Source 
- Unlock surface after making context current
- Lock surface on shutdown
This commit is contained in:
Whitehooder
2018-11-18 10:27:20 -05:00
committed by Adam
parent 1c7113ab7c
commit a696b498aa
2 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
runelite-client/pom.xml
View File

@@ -110,11 +110,24 @@
<classifier>natives-windows-i586</classifier> <classifier>natives-windows-i586</classifier>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>${jogl.version}</version>
<classifier>natives-linux-amd64</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>${jogl.version}</version>
<classifier>natives-linux-i586</classifier>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>org.jogamp.gluegen</groupId> <groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt</artifactId> <artifactId>gluegen-rt</artifactId>
<version>${jogl.version}</version> <version>${jogl.version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jogamp.gluegen</groupId> <groupId>org.jogamp.gluegen</groupId>
@@ -130,6 +143,20 @@
<classifier>natives-windows-i586</classifier> <classifier>natives-windows-i586</classifier>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt</artifactId>
<version>${jogl.version}</version>
<classifier>natives-linux-amd64</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt</artifactId>
<version>${jogl.version}</version>
<classifier>natives-linux-i586</classifier>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>

20
runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
View File

@@ -26,8 +26,7 @@ package net.runelite.client.plugins.gpu;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.inject.Provides; import com.google.inject.Provides;
import com.jogamp.nativewindow.AbstractGraphicsConfiguration; import com.jogamp.nativewindow.NativeSurface;
import com.jogamp.nativewindow.NativeWindowFactory;
import com.jogamp.nativewindow.awt.AWTGraphicsConfiguration; import com.jogamp.nativewindow.awt.AWTGraphicsConfiguration;
import com.jogamp.nativewindow.awt.JAWTWindow; import com.jogamp.nativewindow.awt.JAWTWindow;
import com.jogamp.opengl.GL; import com.jogamp.opengl.GL;
@@ -50,6 +49,7 @@ import java.nio.FloatBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.util.function.Function; import java.util.function.Function;
import javax.inject.Inject; import javax.inject.Inject;
import jogamp.newt.awt.NewtFactoryAWT;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.BufferProvider; import net.runelite.api.BufferProvider;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -231,10 +231,10 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
GLProfile glProfile = GLProfile.get(GLProfile.GL4bc); GLProfile glProfile = GLProfile.get(GLProfile.GL4bc);
GLCapabilities glCaps = new GLCapabilities(glProfile); GLCapabilities glCaps = new GLCapabilities(glProfile);
AbstractGraphicsConfiguration config = AWTGraphicsConfiguration.create(canvas.getGraphicsConfiguration(), AWTGraphicsConfiguration config = AWTGraphicsConfiguration.create(canvas.getGraphicsConfiguration(), glCaps, glCaps);
glCaps, glCaps);
jawtWindow = (JAWTWindow) NativeWindowFactory.getNativeWindow(canvas, config); jawtWindow = NewtFactoryAWT.getNativeWindow(canvas, config);
canvas.setFocusable(true);
GLDrawableFactory glDrawableFactory = GLDrawableFactory.getFactory(glProfile); GLDrawableFactory glDrawableFactory = GLDrawableFactory.getFactory(glProfile);
@@ -248,6 +248,11 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
throw new GLException("Unable to make context current"); throw new GLException("Unable to make context current");
} }
if (jawtWindow.getLock().isLocked())
{
jawtWindow.unlockSurface();
}
this.gl = glContext.getGL().getGL4(); this.gl = glContext.getGL().getGL4();
gl.setSwapInterval(0); gl.setSwapInterval(0);
@@ -316,6 +321,11 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
client.setGpu(false); client.setGpu(false);
client.setDrawCallbacks(null); client.setDrawCallbacks(null);
if (jawtWindow.getLock().getHoldCount() != NativeSurface.LOCK_SURFACE_NOT_READY)
{
jawtWindow.lockSurface();
}
if (bufferId != -1) if (bufferId != -1)
{ {
GLUtil.glDeleteBuffer(gl, bufferId); GLUtil.glDeleteBuffer(gl, bufferId);