diff options
author | Harvey Harrison <[email protected]> | 2012-08-24 18:12:04 -0700 |
---|---|---|
committer | Harvey Harrison <[email protected]> | 2012-08-27 21:01:50 -0700 |
commit | e9534eb735af901b68e16a8a745450dcacfbe101 (patch) | |
tree | c605e470ae63a8b5513e84286f6ceef3847c6fb8 | |
parent | c4a72eb9b4ab2ebf2f3af76f7f48880edad25efd (diff) |
j3dcore: remove callbacks from Pipleline that are empty
Signed-off-by: Harvey Harrison <[email protected]>
-rw-r--r-- | src/classes/share/javax/media/j3d/JoglPipeline.java | 11 | ||||
-rw-r--r-- | src/classes/share/javax/media/j3d/NoopPipeline.java | 10 | ||||
-rw-r--r-- | src/classes/share/javax/media/j3d/Pipeline.java | 23 | ||||
-rw-r--r-- | src/classes/share/javax/media/j3d/Renderer.java | 7 |
4 files changed, 3 insertions, 48 deletions
diff --git a/src/classes/share/javax/media/j3d/JoglPipeline.java b/src/classes/share/javax/media/j3d/JoglPipeline.java index 325b688..17475e4 100644 --- a/src/classes/share/javax/media/j3d/JoglPipeline.java +++ b/src/classes/share/javax/media/j3d/JoglPipeline.java @@ -3340,17 +3340,6 @@ class JoglPipeline extends Pipeline { // --------------------------------------------------------------------- // - // Renderer methods - // - - void cleanupRenderer() { - // Nothing to do - } - - - // --------------------------------------------------------------------- - - // // ColoringAttributesRetained methods // diff --git a/src/classes/share/javax/media/j3d/NoopPipeline.java b/src/classes/share/javax/media/j3d/NoopPipeline.java index 21348f3..2ae8e62 100644 --- a/src/classes/share/javax/media/j3d/NoopPipeline.java +++ b/src/classes/share/javax/media/j3d/NoopPipeline.java @@ -495,16 +495,6 @@ class NoopPipeline extends Pipeline { // --------------------------------------------------------------------- // - // Renderer methods - // - - void cleanupRenderer() { - } - - - // --------------------------------------------------------------------- - - // // ColoringAttributesRetained methods // diff --git a/src/classes/share/javax/media/j3d/Pipeline.java b/src/classes/share/javax/media/j3d/Pipeline.java index 9c9e5ea..98d237d 100644 --- a/src/classes/share/javax/media/j3d/Pipeline.java +++ b/src/classes/share/javax/media/j3d/Pipeline.java @@ -546,29 +546,6 @@ public Pipeline run() { // --------------------------------------------------------------------- // - // J3DBuffer methods - // - - // Method to verify that we can access a direct NIO buffer - // from native code - boolean checkNativeBufferAccess(java.nio.Buffer buffer) { - // Return true by default. Pipeline can override and implement, if - // we decide that it is necessary. - return true; - } - - // --------------------------------------------------------------------- - - // - // Renderer methods - // - - abstract void cleanupRenderer(); - - - // --------------------------------------------------------------------- - - // // ColoringAttributesRetained methods // diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java index a5077df..bdf5614 100644 --- a/src/classes/share/javax/media/j3d/Renderer.java +++ b/src/classes/share/javax/media/j3d/Renderer.java @@ -1496,11 +1496,10 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine } } - // resource clean up - void shutdown() { +// resource clean up +void shutdown() { removeAllCtxs(); - Pipeline.getPipeline().cleanupRenderer(); - } +} void cleanup() { super.cleanup(); |