Merge pull request #7082 from devLotto/issue-6949

gpu: limit msaa samples to supported value
This commit is contained in:
Adam
2018-12-26 18:57:11 -05:00
committed by GitHub

View File

@@ -77,6 +77,7 @@ import static net.runelite.client.plugins.gpu.GLUtil.glDeleteRenderbuffers;
import static net.runelite.client.plugins.gpu.GLUtil.glDeleteTexture; import static net.runelite.client.plugins.gpu.GLUtil.glDeleteTexture;
import static net.runelite.client.plugins.gpu.GLUtil.glDeleteVertexArrays; import static net.runelite.client.plugins.gpu.GLUtil.glDeleteVertexArrays;
import static net.runelite.client.plugins.gpu.GLUtil.glGenBuffers; import static net.runelite.client.plugins.gpu.GLUtil.glGenBuffers;
import static net.runelite.client.plugins.gpu.GLUtil.glGetInteger;
import static net.runelite.client.plugins.gpu.GLUtil.glGenFrameBuffer; import static net.runelite.client.plugins.gpu.GLUtil.glGenFrameBuffer;
import static net.runelite.client.plugins.gpu.GLUtil.glGenRenderbuffer; import static net.runelite.client.plugins.gpu.GLUtil.glGenRenderbuffer;
import static net.runelite.client.plugins.gpu.GLUtil.glGenTexture; import static net.runelite.client.plugins.gpu.GLUtil.glGenTexture;
@@ -898,7 +899,11 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
|| lastAntiAliasingMode != antiAliasingMode) || lastAntiAliasingMode != antiAliasingMode)
{ {
shutdownSceneFbo(); shutdownSceneFbo();
initSceneFbo(stretchedCanvasWidth, stretchedCanvasHeight, antiAliasingMode.getSamples());
final int maxSamples = glGetInteger(gl, gl.GL_MAX_SAMPLES);
final int samples = Math.min(antiAliasingMode.getSamples(), maxSamples);
initSceneFbo(stretchedCanvasWidth, stretchedCanvasHeight, samples);
lastStretchedCanvasWidth = stretchedCanvasWidth; lastStretchedCanvasWidth = stretchedCanvasWidth;
lastStretchedCanvasHeight = stretchedCanvasHeight; lastStretchedCanvasHeight = stretchedCanvasHeight;