diff options
Diffstat (limited to 'src/classes/com/sun/opengl')
14 files changed, 151 insertions, 42 deletions
diff --git a/src/classes/com/sun/opengl/impl/GLContextImpl.java b/src/classes/com/sun/opengl/impl/GLContextImpl.java index d00afde4d..1d51ca9d6 100644 --- a/src/classes/com/sun/opengl/impl/GLContextImpl.java +++ b/src/classes/com/sun/opengl/impl/GLContextImpl.java @@ -165,7 +165,8 @@ public abstract class GLContextImpl extends GLContext { public void destroy() { if (lock.isHeld()) { - throw new GLException("Can not destroy context while it is current"); + // release current context + release(); } /* FIXME: refactor dependence on Java 2D / JOGL bridge diff --git a/src/classes/com/sun/opengl/impl/GLDrawableHelper.java b/src/classes/com/sun/opengl/impl/GLDrawableHelper.java index 8c9568381..e7fea1cee 100644 --- a/src/classes/com/sun/opengl/impl/GLDrawableHelper.java +++ b/src/classes/com/sun/opengl/impl/GLDrawableHelper.java @@ -55,6 +55,16 @@ public class GLDrawableHelper { public GLDrawableHelper() { } + public synchronized String toString() { + StringBuffer sb = new StringBuffer(); + sb.append("GLEventListeners num "+listeners.size()+" ["); + for (Iterator iter = listeners.iterator(); iter.hasNext(); ) { + sb.append(iter.next()+", "); + } + sb.append("]"); + return sb.toString(); + } + public synchronized void addGLEventListener(GLEventListener listener) { List newListeners = (List) ((ArrayList) listeners).clone(); newListeners.add(listener); @@ -67,6 +77,15 @@ public class GLDrawableHelper { listeners = newListeners; } + public synchronized void dispose(GLAutoDrawable drawable) { + List newListeners = (List) ((ArrayList) listeners).clone(); + for (Iterator iter = newListeners.iterator(); iter.hasNext(); ) { + ((GLEventListener) iter.next()).dispose(drawable); + iter.remove(); + } + listeners = newListeners; + } + public void init(GLAutoDrawable drawable) { for (Iterator iter = listeners.iterator(); iter.hasNext(); ) { ((GLEventListener) iter.next()).init(drawable); @@ -117,12 +136,14 @@ public class GLDrawableHelper { try { res = context.makeCurrent(); if (res != GLContext.CONTEXT_NOT_CURRENT) { - perThreadInitAction.set(initAction); - if (res == GLContext.CONTEXT_CURRENT_NEW) { - if (DEBUG) { - System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running initAction"); - } - initAction.run(); + if(null!=initAction) { + perThreadInitAction.set(initAction); + if (res == GLContext.CONTEXT_CURRENT_NEW) { + if (DEBUG) { + System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running initAction"); + } + initAction.run(); + } } if (DEBUG && VERBOSE) { System.err.println("GLDrawableHelper " + this + ".invokeGL(): Running runnable"); diff --git a/src/classes/com/sun/opengl/impl/GLDrawableImpl.java b/src/classes/com/sun/opengl/impl/GLDrawableImpl.java index 46c79cf2b..f01f8eeda 100644 --- a/src/classes/com/sun/opengl/impl/GLDrawableImpl.java +++ b/src/classes/com/sun/opengl/impl/GLDrawableImpl.java @@ -134,7 +134,7 @@ public abstract class GLDrawableImpl implements GLDrawable { } public String toString() { - return "GLDrawable[realized "+getRealized()+ + return getClass().getName()+"[realized "+getRealized()+ ", window "+getNativeWindow()+ ", factory "+getFactory()+"]"; } diff --git a/src/classes/com/sun/opengl/impl/ProjectFloat.java b/src/classes/com/sun/opengl/impl/ProjectFloat.java index 61c1bd8a1..fbeccc61f 100755 --- a/src/classes/com/sun/opengl/impl/ProjectFloat.java +++ b/src/classes/com/sun/opengl/impl/ProjectFloat.java @@ -164,6 +164,7 @@ public class ProjectFloat { private final float[] up = new float[3]; // Buffer-based implementation + private FloatBuffer locbuf; private final FloatBuffer matrixBuf; private final FloatBuffer tempInvertMatrixBuf; @@ -180,24 +181,31 @@ public class ProjectFloat { // Slice up one big buffer because some NIO implementations // allocate a huge amount of memory to back even the smallest of // buffers. - FloatBuffer buf = BufferUtil.newFloatBuffer(2*16+2*4+3*3); + locbuf = BufferUtil.newFloatBuffer(2*16+2*4+3*3); int pos = 0; int sz = 16; - matrixBuf = slice(buf, pos, sz); + matrixBuf = slice(locbuf, pos, sz); pos += sz; - tempInvertMatrixBuf = slice(buf, pos, sz); + tempInvertMatrixBuf = slice(locbuf, pos, sz); pos += sz; sz = 4; - inBuf = slice(buf, pos, sz); + inBuf = slice(locbuf, pos, sz); pos += sz; - outBuf = slice(buf, pos, sz); + outBuf = slice(locbuf, pos, sz); pos += sz; sz = 3; - forwardBuf = slice(buf, pos, sz); + forwardBuf = slice(locbuf, pos, sz); pos += sz; - sideBuf = slice(buf, pos, sz); + sideBuf = slice(locbuf, pos, sz); pos += sz; - upBuf = slice(buf, pos, sz); + upBuf = slice(locbuf, pos, sz); + } + + public void destroy() { + if(locbuf!=null) { + locbuf.clear(); + locbuf=null; + } } private static FloatBuffer slice(FloatBuffer buf, int pos, int len) { diff --git a/src/classes/com/sun/opengl/impl/gl2/ProjectDouble.java b/src/classes/com/sun/opengl/impl/gl2/ProjectDouble.java index 760aba15d..4efbcfb1e 100755 --- a/src/classes/com/sun/opengl/impl/gl2/ProjectDouble.java +++ b/src/classes/com/sun/opengl/impl/gl2/ProjectDouble.java @@ -157,6 +157,7 @@ public class ProjectDouble { private final double[] up = new double[3]; // Buffer-based implementation + private DoubleBuffer locbuf; private final DoubleBuffer matrixBuf; private final DoubleBuffer tempMatrixBuf; @@ -173,24 +174,31 @@ public class ProjectDouble { // Slice up one big buffer because some NIO implementations // allocate a huge amount of memory to back even the smallest of // buffers. - DoubleBuffer buf = BufferUtil.newDoubleBuffer(128); + DoubleBuffer locbuf = BufferUtil.newDoubleBuffer(128); int pos = 0; int sz = 16; - matrixBuf = slice(buf, pos, sz); + matrixBuf = slice(locbuf, pos, sz); pos += sz; - tempMatrixBuf = slice(buf, pos, sz); + tempMatrixBuf = slice(locbuf, pos, sz); pos += sz; sz = 4; - inBuf = slice(buf, pos, sz); + inBuf = slice(locbuf, pos, sz); pos += sz; - outBuf = slice(buf, pos, sz); + outBuf = slice(locbuf, pos, sz); pos += sz; sz = 3; - forwardBuf = slice(buf, pos, sz); + forwardBuf = slice(locbuf, pos, sz); pos += sz; - sideBuf = slice(buf, pos, sz); + sideBuf = slice(locbuf, pos, sz); pos += sz; - upBuf = slice(buf, pos, sz); + upBuf = slice(locbuf, pos, sz); + } + + public void destroy() { + if(locbuf!=null) { + locbuf.clear(); + locbuf=null; + } } private static DoubleBuffer slice(DoubleBuffer buf, int pos, int len) { diff --git a/src/classes/com/sun/opengl/impl/glsl/fixed/FixedFuncPipeline.java b/src/classes/com/sun/opengl/impl/glsl/fixed/FixedFuncPipeline.java index c5b85924d..1d33254c0 100644 --- a/src/classes/com/sun/opengl/impl/glsl/fixed/FixedFuncPipeline.java +++ b/src/classes/com/sun/opengl/impl/glsl/fixed/FixedFuncPipeline.java @@ -53,12 +53,12 @@ public class FixedFuncPipeline { return name; } - public void release(GL2ES2 gl) { - shaderState.release(gl); + public void destroy(GL2ES2 gl) { shaderProgramColor.release(gl, true); shaderProgramColorLight.release(gl, true); shaderProgramColorTexture.release(gl, true); shaderProgramColorTextureLight.release(gl, true); + shaderState.destroy(gl); } public void glEnableClientState(GL2ES2 gl, int glArrayIndex) { diff --git a/src/classes/com/sun/opengl/impl/jawt/JAWTWindow.java b/src/classes/com/sun/opengl/impl/jawt/JAWTWindow.java index ebbb7f666..b38df14ec 100644 --- a/src/classes/com/sun/opengl/impl/jawt/JAWTWindow.java +++ b/src/classes/com/sun/opengl/impl/jawt/JAWTWindow.java @@ -128,10 +128,6 @@ public abstract class JAWTWindow implements NativeWindow { return component; } - public final boolean isTerminalObject() { - return true; - } - public void setSize(int width, int height) { component.setSize(width, height); } @@ -145,10 +141,17 @@ public abstract class JAWTWindow implements NativeWindow { } public String toString() { - return "JAWT-Window[windowHandle "+getWindowHandle()+ + StringBuffer sb = new StringBuffer(); + + sb.append("JAWT-Window[windowHandle "+getWindowHandle()+ ", surfaceHandle "+getSurfaceHandle()+ - ", size "+getWidth()+"x"+getHeight()+ + ", pos "+component.getX()+"/"+component.getY()+", size "+getWidth()+"x"+getHeight()+ + ", visible "+component.isVisible()+ ", wrappedWindow "+getWrappedWindow()+ - ", terminalObject "+isTerminalObject()+"]"; + ", visualID "+visualID+ + ", screen handle/index "+getScreenHandle()+"/"+getScreenIndex() + + ", display handle "+getDisplayHandle()+"]"); + + return sb.toString(); } } diff --git a/src/classes/com/sun/opengl/util/awt/TextRenderer.java b/src/classes/com/sun/opengl/util/awt/TextRenderer.java index 4e80dfaa4..b7616d879 100755 --- a/src/classes/com/sun/opengl/util/awt/TextRenderer.java +++ b/src/classes/com/sun/opengl/util/awt/TextRenderer.java @@ -1882,6 +1882,12 @@ public class TextRenderer { } } + public void dispose(GLAutoDrawable drawable) { + glu.destroy(); + glu=null; + frame=null; + } + // Unused methods public void init(GLAutoDrawable drawable) { } diff --git a/src/classes/com/sun/opengl/util/glsl/ShaderCode.java b/src/classes/com/sun/opengl/util/glsl/ShaderCode.java index 288ef760b..f5ed88ff0 100644 --- a/src/classes/com/sun/opengl/util/glsl/ShaderCode.java +++ b/src/classes/com/sun/opengl/util/glsl/ShaderCode.java @@ -244,11 +244,21 @@ public class ShaderCode { return valid; } - public void release(GL2ES2 gl) { + public void destroy(GL2ES2 gl) { if(isValid()) { - gl.glDeleteShader(shader()); + if(null!=gl) { + gl.glDeleteShader(shader()); + } valid=false; } + if(null!=shaderBinary) { + shaderBinary.clear(); + shaderBinary=null; + } + shaderSource=null; + shaderBinaryFormat=-1; + shaderType=-1; + id=null; } public boolean equals(Object obj) { diff --git a/src/classes/com/sun/opengl/util/glsl/ShaderProgram.java b/src/classes/com/sun/opengl/util/glsl/ShaderProgram.java index 066244fa6..7973c471f 100644 --- a/src/classes/com/sun/opengl/util/glsl/ShaderProgram.java +++ b/src/classes/com/sun/opengl/util/glsl/ShaderProgram.java @@ -37,14 +37,29 @@ public class ShaderProgram { public Integer key() { return id; } /** - * @see #glReleaseAllVertexAttributes + * Detaches all shader codes and deletes the program. + * Destroys the shader codes as well. + * Calls release(gl, true) + * + * @see #release(GL2ES2, boolean) + */ + public synchronized void destroy(GL2ES2 gl) { + release(gl, true); + } + + /** + * Detaches all shader codes and deletes the program. + * Calls release(gl, false) + * + * @see #release(GL2ES2, boolean) */ public synchronized void release(GL2ES2 gl) { release(gl, false); } /** - * @see #glReleaseAllVertexAttributes + * Detaches all shader codes and deletes the program. + * If releaseShaderToo is true, destroys the shader codes as well. */ public synchronized void release(GL2ES2 gl, boolean releaseShaderToo) { glUseProgram(gl, false); @@ -52,7 +67,7 @@ public class ShaderProgram { ShaderCode shaderCode = (ShaderCode) iter.next(); gl.glDetachShader(shaderProgram, shaderCode.shader()); if(releaseShaderToo) { - shaderCode.release(gl); + shaderCode.destroy(gl); } } shaderMap.clear(); diff --git a/src/classes/com/sun/opengl/util/glsl/ShaderState.java b/src/classes/com/sun/opengl/util/glsl/ShaderState.java index 6320f9c6a..52ae35d2d 100644 --- a/src/classes/com/sun/opengl/util/glsl/ShaderState.java +++ b/src/classes/com/sun/opengl/util/glsl/ShaderState.java @@ -105,13 +105,32 @@ public class ShaderState { public ShaderProgram shaderProgram() { return shaderProgram; } /** + * Calls release(gl, true, true) + * + * @see #glReleaseAllVertexAttributes + * @see #glReleaseAllUniforms + * @see #release(GL2ES2, boolean, boolean) + */ + public synchronized void destroy(GL2ES2 gl) { + release(gl, true, true); + } + + /** + * Calls release(gl, false, false) + * * @see #glReleaseAllVertexAttributes * @see #glReleaseAllUniforms + * @see #release(GL2ES2, boolean, boolean) */ - public synchronized void release(GL2ES2 gl) { + public synchronized void releaseAllData(GL2ES2 gl) { release(gl, false, false); } + /** + * @see #glReleaseAllVertexAttributes + * @see #glReleaseAllUniforms + * @see ShaderProgram#release(GL2ES2, boolean) + */ public synchronized void release(GL2ES2 gl, boolean releaseProgramToo, boolean releaseShaderToo) { boolean prgInUse = false; if(null!=shaderProgram) { diff --git a/src/classes/com/sun/opengl/util/glsl/fixed/FixedFuncHook.java b/src/classes/com/sun/opengl/util/glsl/fixed/FixedFuncHook.java index d4b3be046..8c4b539d5 100755 --- a/src/classes/com/sun/opengl/util/glsl/fixed/FixedFuncHook.java +++ b/src/classes/com/sun/opengl/util/glsl/fixed/FixedFuncHook.java @@ -46,8 +46,8 @@ public class FixedFuncHook implements GLFixedFuncHookIf { vertexColorFile, vertexColorLightFile, fragmentColorFile, fragmentColorTextureFile); } - public void dispose() { - fixedFunction.release(gl); + public void destroy() { + fixedFunction.destroy(gl); fixedFunction = null; } diff --git a/src/classes/com/sun/opengl/util/texture/Texture.java b/src/classes/com/sun/opengl/util/texture/Texture.java index 29f22e57a..e16b840fa 100755 --- a/src/classes/com/sun/opengl/util/texture/Texture.java +++ b/src/classes/com/sun/opengl/util/texture/Texture.java @@ -264,17 +264,28 @@ public class Texture { * * @throws GLException if no OpenGL context was current or if any * OpenGL-related errors occurred + * @deprecated use destroy(GL) */ public void dispose() throws GLException { - dispose(GLU.getCurrentGL()); + destroy(GLU.getCurrentGL()); } /** * Disposes the native resources used by this texture object. * * @throws GLException if any OpenGL-related errors occurred + * @deprecated use destroy(GL) */ public void dispose(GL gl) throws GLException { + destroy(gl); + } + + /** + * Destroys the native resources used by this texture object. + * + * @throws GLException if any OpenGL-related errors occurred + */ + public void destroy(GL gl) throws GLException { gl.glDeleteTextures(1, new int[] {texID}, 0); texID = 0; } diff --git a/src/classes/com/sun/opengl/util/texture/TextureData.java b/src/classes/com/sun/opengl/util/texture/TextureData.java index dcaee52f2..8dbd124af 100755 --- a/src/classes/com/sun/opengl/util/texture/TextureData.java +++ b/src/classes/com/sun/opengl/util/texture/TextureData.java @@ -310,6 +310,13 @@ public class TextureData { } } + /** Calls flush() + * @see #flush() + */ + public void destroy() { + flush(); + } + /** Defines a callback mechanism to allow the user to explicitly deallocate native resources (memory-mapped files, etc.) associated with a particular TextureData. */ |