From e9534eb735af901b68e16a8a745450dcacfbe101 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Fri, 24 Aug 2012 18:12:04 -0700
Subject: j3dcore: remove callbacks from Pipleline that are empty

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 .../share/javax/media/j3d/JoglPipeline.java        | 11 -----------
 .../share/javax/media/j3d/NoopPipeline.java        | 10 ----------
 src/classes/share/javax/media/j3d/Pipeline.java    | 23 ----------------------
 src/classes/share/javax/media/j3d/Renderer.java    |  7 +++----
 4 files changed, 3 insertions(+), 48 deletions(-)

(limited to 'src')

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
@@ -3337,17 +3337,6 @@ class JoglPipeline extends Pipeline {
         return -1;
     }
 
-    // ---------------------------------------------------------------------
-
-    //
-    // Renderer methods
-    //
-
-    void cleanupRenderer() {
-        // Nothing to do
-    }
-
-
     // ---------------------------------------------------------------------
 
     //
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
@@ -492,16 +492,6 @@ class NoopPipeline extends Pipeline {
     }
 
 
-    // ---------------------------------------------------------------------
-
-    //
-    // Renderer methods
-    //
-
-    void cleanupRenderer() {
-    }
-
-
     // ---------------------------------------------------------------------
 
     //
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
@@ -543,29 +543,6 @@ public Pipeline run() {
     abstract ShaderError useGLSLShaderProgram(Context ctx, ShaderProgramId shaderProgramId);
 
 
-    // ---------------------------------------------------------------------
-
-    //
-    // 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();
-
-
     // ---------------------------------------------------------------------
 
     //
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();
-- 
cgit v1.2.3