From 0e0ab268b810371828f23d9e5f6be46a3c8a081f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 16 Oct 2012 15:40:28 +0200 Subject: Jogl*Driver.shutdown(): Release hold ctx before killing window offthread (required since we don't release ctx after each frame) --- src/jake2/render/opengl/JoglES1Driver.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/jake2/render/opengl/JoglES1Driver.java') diff --git a/src/jake2/render/opengl/JoglES1Driver.java b/src/jake2/render/opengl/JoglES1Driver.java index afb1c12..b1d882d 100644 --- a/src/jake2/render/opengl/JoglES1Driver.java +++ b/src/jake2/render/opengl/JoglES1Driver.java @@ -72,6 +72,7 @@ public abstract class JoglES1Driver extends JoglGL2ES1 implements GLDriver { } public void shutdown() { + deactivate(); if(null != newtWin) { newtWin.shutdown(); } @@ -103,11 +104,7 @@ public abstract class JoglES1Driver extends JoglGL2ES1 implements GLDriver { public void endFrame() { newtWin.window.swapBuffers(); - /** - final GLContext ctx = newtWin.window.getContext(); - if ( null != ctx && GLContext.getCurrent() == ctx) { - ctx.release(); - } */ + // deactivate(); newtWin.fpsCounter.tickFPS(); } @@ -136,6 +133,13 @@ public abstract class JoglES1Driver extends JoglGL2ES1 implements GLDriver { ctx.makeCurrent(); } } - + + protected void deactivate() { + final GLContext ctx = newtWin.window.getContext(); + if ( null != ctx && GLContext.getCurrent() == ctx) { + ctx.release(); + } + } + // -------------------------------------------------------------------------- } -- cgit v1.2.3