diff options
Diffstat (limited to 'src/classes/com/sun')
23 files changed, 304 insertions, 87 deletions
diff --git a/src/classes/com/sun/javafx/newt/GLWindow.java b/src/classes/com/sun/javafx/newt/GLWindow.java index 53943b087..3b35beae3 100644 --- a/src/classes/com/sun/javafx/newt/GLWindow.java +++ b/src/classes/com/sun/javafx/newt/GLWindow.java @@ -73,6 +73,7 @@ public class GLWindow extends Window implements GLAutoDrawable { create()} instead. */ protected GLWindow(Window window) { this.window = window; + this.window.setAutoDrawableMember(true); window.addWindowListener(new WindowListener() { public void windowResized(WindowEvent e) { sendReshape = true; @@ -80,13 +81,17 @@ public class GLWindow extends Window implements GLAutoDrawable { public void windowMoved(WindowEvent e) { } + + public void windowDestroyNotify(WindowEvent e) { + sendDispose = true; + } }); } /** Creates a new GLWindow on the local display, screen 0, with a dummy visual ID, and with the default NWCapabilities. */ public static GLWindow create() { - return create(null, null); + return create(null, null, false); } public static GLWindow create(boolean undecorated) { @@ -95,10 +100,10 @@ public class GLWindow extends Window implements GLAutoDrawable { /** Creates a new GLWindow referring to the given window. */ public static GLWindow create(Window window) { - return create(window, null); + return create(window, null, false); } public static GLWindow create(NWCapabilities caps) { - return create(caps, false); + return create(null, caps, false); } /** Creates a new GLWindow on the local display, screen 0, with a @@ -135,18 +140,32 @@ public class GLWindow extends Window implements GLAutoDrawable { shouldNotCallThis(); } - public void close() { + public synchronized void destroy() { + if(Window.DEBUG_WINDOW_EVENT) { + Exception e1 = new Exception("GLWindow.destroy 1: "+this); + e1.printStackTrace(); + } + + sendDisposeEvent(); + if (context != null) { - if (context == GLContext.getCurrent()) { - context.release(); - } context.destroy(); } if (drawable != null) { drawable.setRealized(false); } - window.close(); + if(null!=window) { + window.destroy(); + } + + if(Window.DEBUG_WINDOW_EVENT) { + System.out.println("GLWindow.destroy fin: "+this); + } + + drawable = null; + context = null; + window = null; } public boolean getPerfLogEnabled() { return perfLog; } @@ -322,6 +341,10 @@ public class GLWindow extends Window implements GLAutoDrawable { return window.getWindowListeners(); } + public String toString() { + return "NEWT-GLWindow[ "+drawable+", "+helper+", "+factory+"]"; + } + //---------------------------------------------------------------------- // OpenGL-related methods and state // @@ -332,7 +355,8 @@ public class GLWindow extends Window implements GLAutoDrawable { private GLContext context; private GLDrawableHelper helper = new GLDrawableHelper(); // To make reshape events be sent immediately before a display event - private boolean sendReshape; + private boolean sendReshape=false; + private boolean sendDispose=false; private boolean perfLog = false; public GLDrawableFactory getFactory() { @@ -369,8 +393,21 @@ public class GLWindow extends Window implements GLAutoDrawable { } public void display() { - pumpMessages(); - helper.invokeGL(drawable, context, displayAction, initAction); + if(window.getSurfaceHandle()!=0) { + pumpMessages(); + if (sendDispose) { + destroy(); + sendDispose=false; + } else { + helper.invokeGL(drawable, context, displayAction, initAction); + } + } + } + + private void sendDisposeEvent() { + if(disposeAction!=null && drawable!=null && context != null && window!=null && window.getSurfaceHandle()!=0) { + helper.invokeGL(drawable, context, disposeAction, null); + } } public void setAutoSwapBufferMode(boolean onOrOff) { @@ -382,11 +419,13 @@ public class GLWindow extends Window implements GLAutoDrawable { } public void swapBuffers() { - if (context != null && context != GLContext.getCurrent()) { - // Assume we should try to make the context current before swapping the buffers - helper.invokeGL(drawable, context, swapBuffersAction, initAction); - } else { - drawable.swapBuffers(); + if(window.getSurfaceHandle()!=0) { + if (context != null && context != GLContext.getCurrent()) { + // Assume we should try to make the context current before swapping the buffers + helper.invokeGL(drawable, context, swapBuffersAction, initAction); + } else { + drawable.swapBuffers(); + } } } @@ -403,6 +442,13 @@ public class GLWindow extends Window implements GLAutoDrawable { } private InitAction initAction = new InitAction(); + class DisposeAction implements Runnable { + public void run() { + helper.dispose(GLWindow.this); + } + } + private DisposeAction disposeAction = new DisposeAction(); + class DisplayAction implements Runnable { public void run() { if (sendReshape) { diff --git a/src/classes/com/sun/javafx/newt/Window.java b/src/classes/com/sun/javafx/newt/Window.java index a1e983c3c..8ba7610b3 100755 --- a/src/classes/com/sun/javafx/newt/Window.java +++ b/src/classes/com/sun/javafx/newt/Window.java @@ -162,7 +162,9 @@ public abstract class Window implements NativeWindow protected abstract void dispatchMessages(int eventMask); public String toString() { - return "NEWT-Window[windowHandle "+getWindowHandle()+ + StringBuffer sb = new StringBuffer(); + + sb.append("NEWT-Window[windowHandle "+getWindowHandle()+ ", surfaceHandle "+getSurfaceHandle()+ ", pos "+getX()+"/"+getY()+", size "+getWidth()+"x"+getHeight()+ ", visible "+isVisible()+ @@ -170,7 +172,22 @@ public abstract class Window implements NativeWindow ", visualID "+visualID+ ", "+chosenCaps+ ", screen handle/index "+getScreenHandle()+"/"+getScreenIndex() + - ", display handle "+getDisplayHandle()+ "]"; + ", display handle "+getDisplayHandle()); + + sb.append(", WindowListeners num "+windowListeners.size()+" ["); + for (Iterator iter = windowListeners.iterator(); iter.hasNext(); ) { + sb.append(iter.next()+", "); + } + sb.append("], MouseListeners num "+mouseListeners.size()+" ["); + for (Iterator iter = mouseListeners.iterator(); iter.hasNext(); ) { + sb.append(iter.next()+", "); + } + sb.append("], KeyListeners num "+keyListeners.size()+" ["); + for (Iterator iter = keyListeners.iterator(); iter.hasNext(); ) { + sb.append(iter.next()+", "); + } + sb.append("]"); + return sb.toString(); } protected Screen screen; @@ -233,9 +250,18 @@ public abstract class Window implements NativeWindow return locked; } - public void close() { + public synchronized void destroy() { + if(DEBUG_WINDOW_EVENT) { + System.out.println("Window.destroy() start"); + } + windowListeners = new ArrayList(); + mouseListeners = new ArrayList(); + keyListeners = new ArrayList(); closeNative(); invalidate(); + if(DEBUG_WINDOW_EVENT) { + System.out.println("Window.destroy() end"); + } } public void invalidate() { @@ -334,6 +360,40 @@ public abstract class Window implements NativeWindow return fullscreen; } + private boolean autoDrawableMember = false; + + /** + * If set to true, + * certain action will be performed by the owning + * AutoDrawable, ie the destroy() call within windowDestroyNotify() + */ + protected void setAutoDrawableMember(boolean b) { + autoDrawableMember = b; + } + + protected void windowDestroyNotify() { + if(DEBUG_WINDOW_EVENT) { + System.out.println("Window.windowDestroyeNotify start"); + } + + sendWindowEvent(WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY); + + if(!autoDrawableMember) { + destroy(); + } + + if(DEBUG_WINDOW_EVENT) { + System.out.println("Window.windowDestroyeNotify end"); + } + } + + protected void windowDestroyed() { + if(DEBUG_WINDOW_EVENT) { + System.out.println("Window.windowDestroyed"); + } + invalidate(); + } + public abstract void setVisible(boolean visible); public abstract void setSize(int width, int height); public abstract void setPosition(int x, int y); @@ -562,6 +622,9 @@ public abstract class Window implements NativeWindow case WindowEvent.EVENT_WINDOW_MOVED: l.windowMoved(e); break; + case WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY: + l.windowDestroyNotify(e); + break; default: throw new NativeWindowException("Unexpected window event type " + e.getEventType()); } diff --git a/src/classes/com/sun/javafx/newt/WindowEvent.java b/src/classes/com/sun/javafx/newt/WindowEvent.java index 49cdb5497..a502e912c 100644 --- a/src/classes/com/sun/javafx/newt/WindowEvent.java +++ b/src/classes/com/sun/javafx/newt/WindowEvent.java @@ -36,6 +36,7 @@ package com.sun.javafx.newt; public class WindowEvent extends Event { public static final int EVENT_WINDOW_RESIZED = 100; public static final int EVENT_WINDOW_MOVED = 101; + public static final int EVENT_WINDOW_DESTROY_NOTIFY = 102; public WindowEvent(int eventType, Window source, long when) { this(false, eventType, source, when); @@ -49,6 +50,7 @@ public class WindowEvent extends Event { switch(type) { case EVENT_WINDOW_RESIZED: return "WINDOW_RESIZED"; case EVENT_WINDOW_MOVED: return "WINDOW_MOVED"; + case EVENT_WINDOW_DESTROY_NOTIFY: return "EVENT_WINDOW_DESTROY_NOTIFY"; default: return "unknown (" + type + ")"; } } diff --git a/src/classes/com/sun/javafx/newt/WindowListener.java b/src/classes/com/sun/javafx/newt/WindowListener.java index b76202f01..e8423cbcc 100644 --- a/src/classes/com/sun/javafx/newt/WindowListener.java +++ b/src/classes/com/sun/javafx/newt/WindowListener.java @@ -36,4 +36,5 @@ package com.sun.javafx.newt; public interface WindowListener extends EventListener { public void windowResized(WindowEvent e); public void windowMoved(WindowEvent e); + public void windowDestroyNotify(WindowEvent e); } diff --git a/src/classes/com/sun/javafx/newt/kd/KDWindow.java b/src/classes/com/sun/javafx/newt/kd/KDWindow.java index 01570e1bb..276fc3ebd 100755 --- a/src/classes/com/sun/javafx/newt/kd/KDWindow.java +++ b/src/classes/com/sun/javafx/newt/kd/KDWindow.java @@ -156,9 +156,6 @@ public class KDWindow extends Window { sendWindowEvent(WindowEvent.EVENT_WINDOW_RESIZED); } - private void windowClosed() { - } - private long eglWindowHandle; private long windowHandleClose; private int windowID; diff --git a/src/classes/com/sun/javafx/newt/macosx/MacWindow.java b/src/classes/com/sun/javafx/newt/macosx/MacWindow.java index f80f0b3ab..b465f505c 100755 --- a/src/classes/com/sun/javafx/newt/macosx/MacWindow.java +++ b/src/classes/com/sun/javafx/newt/macosx/MacWindow.java @@ -245,11 +245,6 @@ public class MacWindow extends Window { } } - private void windowClosed() { - nativeWindow = 0; - visible = false; - } - private char convertKeyChar(char keyChar) { if (keyChar == '\r') { // Turn these into \n diff --git a/src/classes/com/sun/javafx/newt/windows/WindowsWindow.java b/src/classes/com/sun/javafx/newt/windows/WindowsWindow.java index 8b9d635e8..a0cf1e7bc 100755 --- a/src/classes/com/sun/javafx/newt/windows/WindowsWindow.java +++ b/src/classes/com/sun/javafx/newt/windows/WindowsWindow.java @@ -83,9 +83,15 @@ public class WindowsWindow extends Window { } if(windowHandleClose != 0) { DestroyWindow(windowHandleClose); + windowHandleClose = 0; } } + protected void windowDestroyed() { + windowHandleClose = 0; + super.windowDestroyed(); + } + public void setVisible(boolean visible) { if(this.visible!=visible) { this.visible=visible; @@ -166,10 +172,4 @@ public class WindowsWindow extends Window { y = newY; sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED); } - - private void windowClosed() { - } - - private void windowDestroyed() { - } } diff --git a/src/classes/com/sun/javafx/newt/x11/X11Window.java b/src/classes/com/sun/javafx/newt/x11/X11Window.java index 312cc161d..cd69b75ef 100755 --- a/src/classes/com/sun/javafx/newt/x11/X11Window.java +++ b/src/classes/com/sun/javafx/newt/x11/X11Window.java @@ -68,9 +68,17 @@ public class X11Window extends Window { protected void closeNative() { if(0!=displayHandleClose && 0!=windowHandleClose) { CloseWindow(displayHandleClose, windowHandleClose); + windowHandleClose = 0; + displayHandleClose = 0; } } + protected void windowDestroyed() { + windowHandleClose = 0; + displayHandleClose = 0; + super.windowDestroyed(); + } + public void setVisible(boolean visible) { if(this.visible!=visible) { this.visible=visible; @@ -108,7 +116,7 @@ public class X11Window extends Window { } protected void dispatchMessages(int eventMask) { - DispatchMessages(getDisplayHandle(), windowHandle, eventMask); + DispatchMessages(getDisplayHandle(), windowHandle, eventMask, windowDeleteAtom); } //---------------------------------------------------------------------- @@ -120,7 +128,7 @@ public class X11Window extends Window { long visualID, int x, int y, int width, int height); private native void CloseWindow(long display, long windowHandle); private native void setVisible0(long display, long windowHandle, boolean visible); - private native void DispatchMessages(long display, long windowHandle, int eventMask); + private native void DispatchMessages(long display, long windowHandle, int eventMask, long windowDeleteAtom); private native void setSize0(long display, long windowHandle, int width, int height, int decorationToggle, boolean isVisible); private native void setPosition0(long display, long windowHandle, int x, int y); @@ -144,17 +152,13 @@ public class X11Window extends Window { sendWindowEvent(WindowEvent.EVENT_WINDOW_MOVED); } - private void windowCreated(long visualID, long windowHandle) { + private void windowCreated(long visualID, long windowHandle, long windowDeleteAtom) { this.visualID = visualID; this.windowHandle = windowHandle; - } - - private void windowClosed() { - } - - private void windowDestroyed() { + this.windowDeleteAtom=windowDeleteAtom; } private long windowHandleClose; private long displayHandleClose; + private long windowDeleteAtom; } 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. */ diff --git a/src/classes/com/sun/openmax/OMXInstance.java b/src/classes/com/sun/openmax/OMXInstance.java index abddee5a8..0af6901b8 100644 --- a/src/classes/com/sun/openmax/OMXInstance.java +++ b/src/classes/com/sun/openmax/OMXInstance.java @@ -329,7 +329,7 @@ public class OMXInstance { } native float _getCurrentPosition(long moviePtr); - public synchronized void dispose(GL gl) { + public synchronized void destroy(GL gl) { removeAllEGLImageTexture2D(gl); if (moviePtr != 0) { long ptr = moviePtr; @@ -344,7 +344,7 @@ public class OMXInstance { } protected synchronized void finalize() { if (moviePtr != 0) { - dispose(null); + destroy(null); } } native void _destroyInstance(long moviePtr); @@ -453,7 +453,7 @@ public class OMXInstance { eglExt.eglDestroySync(eglImgTexs[i].sync); } if(null!=gl) { - eglImgTexs[i].texture.dispose(gl); + eglImgTexs[i].texture.destroy(gl); } eglImgTexs[i]=null; } |