From a241887b07adf3cdcda780b7a40c482fa02b4699 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Mon, 30 Jul 2012 22:18:59 -0700 Subject: j3dcore: remove the dummy Pipeline method initializeJ3D disableXinerama is now unused, remove it. Signed-off-by: Harvey Harrison --- .../share/javax/media/j3d/JoglPipeline.java | 6 ------ .../share/javax/media/j3d/MasterControl.java | 24 ---------------------- .../share/javax/media/j3d/NoopPipeline.java | 5 ----- src/classes/share/javax/media/j3d/Pipeline.java | 3 --- 4 files changed, 38 deletions(-) diff --git a/src/classes/share/javax/media/j3d/JoglPipeline.java b/src/classes/share/javax/media/j3d/JoglPipeline.java index 3e76c74..1ada96f 100644 --- a/src/classes/share/javax/media/j3d/JoglPipeline.java +++ b/src/classes/share/javax/media/j3d/JoglPipeline.java @@ -6160,12 +6160,6 @@ class JoglPipeline extends Pipeline { // MasterControl methods // - // Method to initialize the native J3D library - boolean initializeJ3D(boolean disableXinerama) { - // Dummy method in JOGL pipeline - return true; - } - // Maximum lights supported by the native API int getMaximumLights() { if (VERBOSE) System.err.println("JoglPipeline.getMaximumLights()"); diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java index e652190..a418421 100644 --- a/src/classes/share/javax/media/j3d/MasterControl.java +++ b/src/classes/share/javax/media/j3d/MasterControl.java @@ -455,10 +455,6 @@ class MasterControl { // This is used for D3D only int resendTexTimestamp = 0; - // Indicates that the property to disable Xinerama mode was set and - // successfully disabled. - boolean xineramaDisabled = false; - // Set by the -Dj3d.sortShape3DBounds property, When this flag is // set to true, the bounds of the Shape3D node will be used in // place of the computed GeometryArray bounds for transparency @@ -658,12 +654,6 @@ class MasterControl { glslVertexAttrOffset); } - // See if Xinerama should be disabled for better performance. - boolean disableXinerama = false; - if (getProperty("j3d.disableXinerama") != null) { - disableXinerama = true; - } - // Issue 480 : Cache bounds returned by getBounds() cacheAutoComputedBounds = getBooleanProperty("j3d.cacheAutoComputeBounds", @@ -676,20 +666,6 @@ class MasterControl { useBoxForGroupBounds, "Use of BoundingBox for group geometric bounds"); - // Initialize the native J3D library - if (!Pipeline.getPipeline().initializeJ3D(disableXinerama)) { - throw new RuntimeException(J3dI18N.getString("MasterControl0")); - } - - if (xineramaDisabled) { - // initializeJ3D() successfully disabled Xinerama. - System.err.println("Java 3D: Xinerama disabled"); - } - else if (disableXinerama) { - // j3d.disableXinerama is true, but attempt failed. - System.err.println("Java 3D: could not disable Xinerama"); - } - // Check for obsolete properties String[] obsoleteProps = { "j3d.backgroundtexture", diff --git a/src/classes/share/javax/media/j3d/NoopPipeline.java b/src/classes/share/javax/media/j3d/NoopPipeline.java index f9c1300..ad2ace7 100644 --- a/src/classes/share/javax/media/j3d/NoopPipeline.java +++ b/src/classes/share/javax/media/j3d/NoopPipeline.java @@ -947,11 +947,6 @@ class NoopPipeline extends Pipeline { // MasterControl methods // - // Method to initialize the native J3D library - boolean initializeJ3D(boolean disableXinerama) { - return true; - } - // Maximum lights supported by the native API int getMaximumLights() { return 8; diff --git a/src/classes/share/javax/media/j3d/Pipeline.java b/src/classes/share/javax/media/j3d/Pipeline.java index 3282495..d93b184 100644 --- a/src/classes/share/javax/media/j3d/Pipeline.java +++ b/src/classes/share/javax/media/j3d/Pipeline.java @@ -963,9 +963,6 @@ public Pipeline run() { // MasterControl methods // - // Method to initialize the native J3D library - abstract boolean initializeJ3D(boolean disableXinerama); - // Maximum lights supported by the native API abstract int getMaximumLights(); -- cgit v1.2.3