aboutsummaryrefslogtreecommitdiffstats
path: root/src/classes/share
diff options
context:
space:
mode:
authorHarvey Harrison <[email protected]>2012-11-18 13:09:00 -0800
committerHarvey Harrison <[email protected]>2012-11-18 13:09:00 -0800
commit96f9509b5e2496be77d702b6d3e037d3576f109b (patch)
treeed1b01bcee3b667b86177286771ba785e2ce3337 /src/classes/share
parentf24a01217f39df3b02a01444ac1a720994f090c8 (diff)
j3dcore: swapBuffer always returns NOCHANGE now, kill some dead code
Signed-off-by: Harvey Harrison <[email protected]>
Diffstat (limited to 'src/classes/share')
-rw-r--r--src/classes/share/javax/media/j3d/Canvas3D.java13
-rw-r--r--src/classes/share/javax/media/j3d/JoglPipeline.java2
-rw-r--r--src/classes/share/javax/media/j3d/NoopPipeline.java8
-rw-r--r--src/classes/share/javax/media/j3d/Renderer.java16
4 files changed, 13 insertions, 26 deletions
diff --git a/src/classes/share/javax/media/j3d/Canvas3D.java b/src/classes/share/javax/media/j3d/Canvas3D.java
index 1ffd891..c8aaa87 100644
--- a/src/classes/share/javax/media/j3d/Canvas3D.java
+++ b/src/classes/share/javax/media/j3d/Canvas3D.java
@@ -2382,10 +2382,7 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
return;
}
this.syncRender(ctx, true);
- int status = swapBuffers(ctx, drawable);
- if (status != NOCHANGE) {
- resetImmediateRendering(status);
- }
+ swapBuffers(ctx, drawable);
drawingSurfaceObject.unLock();
}
}
@@ -4797,10 +4794,10 @@ void addTextureResource(int id, TextureRetained obj) {
Pipeline.getPipeline().readOffScreenBuffer(this, ctx, format, type, data, width, height);
}
- // The native method for swapBuffers
- int swapBuffers(Context ctx, Drawable drawable) {
- return Pipeline.getPipeline().swapBuffers(this, ctx, drawable);
- }
+// The native method for swapBuffers
+void swapBuffers(Context ctx, Drawable drawable) {
+ Pipeline.getPipeline().swapBuffers(this, ctx, drawable);
+}
// -----------------------------------------------------------------------------
diff --git a/src/classes/share/javax/media/j3d/JoglPipeline.java b/src/classes/share/javax/media/j3d/JoglPipeline.java
index fc833da..6d71b2c 100644
--- a/src/classes/share/javax/media/j3d/JoglPipeline.java
+++ b/src/classes/share/javax/media/j3d/JoglPipeline.java
@@ -6427,7 +6427,7 @@ class JoglPipeline extends Pipeline {
if (VERBOSE) System.err.println("JoglPipeline.swapBuffers()");
GLDrawable draw = drawable(drawable);
draw.swapBuffers();
- return 0;
+ return Canvas3D.NOCHANGE;
}
// native method for setting Material when no material is present
diff --git a/src/classes/share/javax/media/j3d/NoopPipeline.java b/src/classes/share/javax/media/j3d/NoopPipeline.java
index 2ae8e62..1eb78dc 100644
--- a/src/classes/share/javax/media/j3d/NoopPipeline.java
+++ b/src/classes/share/javax/media/j3d/NoopPipeline.java
@@ -963,10 +963,10 @@ class NoopPipeline extends Pipeline {
void readOffScreenBuffer(Canvas3D cv, Context ctx, int format, int type, Object data, int width, int height) {
}
- // The native method for swapBuffers
- int swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
- return 0;
- }
+// The native method for swapBuffers
+int swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
+ return Canvas3D.NOCHANGE;
+}
// native method for setting Material when no material is present
void updateMaterialColor(Context ctx, float r, float g, float b, float a) {
diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java
index bdf5614..c4bab5b 100644
--- a/src/classes/share/javax/media/j3d/Renderer.java
+++ b/src/classes/share/javax/media/j3d/Renderer.java
@@ -216,7 +216,7 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
accumRightX = 0.0, accumRightY = 0.0,
accumInfLeftX = 0.0, accumInfLeftY = 0.0,
accumInfRightX = 0.0, accumInfRightY = 0.0;
- int opArg, status;
+ int opArg;
Transform3D t3d = null;
opArg = ((Integer)args[0]).intValue();
@@ -256,22 +256,12 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
}
cv.makeCtxCurrent();
cv.syncRender(cv.ctx, true);
- status = cv.swapBuffers(cv.ctx,
- cv.drawable);
- if (status != Canvas3D.NOCHANGE) {
- cv.resetRendering(status);
- }
+ cv.swapBuffers(cv.ctx, cv.drawable);
cv.drawingSurfaceObject.unLock();
} else {
cv.makeCtxCurrent();
-
cv.syncRender(cv.ctx, true);
- status = cv.swapBuffers(cv.ctx,
- cv.drawable);
- if (status != Canvas3D.NOCHANGE) {
- cv.resetRendering(status);
- }
-
+ cv.swapBuffers(cv.ctx, cv.drawable);
}
}
}