From 9d3ff706567b17c55cbe8e8949914c1da02aee16 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Thu, 3 May 2012 17:10:37 -0700 Subject: j3dcore: remove static feature boolean for CG library Signed-off-by: Harvey Harrison --- src/classes/share/javax/media/j3d/MasterControl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java index 3cd1841..e3fadef 100644 --- a/src/classes/share/javax/media/j3d/MasterControl.java +++ b/src/classes/share/javax/media/j3d/MasterControl.java @@ -386,7 +386,6 @@ class MasterControl { // to check for the actual extension support when the Canvas3D with its associated context // is created. Note that these are qualifed by the above globalShadingLanguage, so at // most one of these two flags will be true; - static boolean cgLibraryAvailable = false; static boolean glslLibraryAvailable = false; @@ -929,9 +928,6 @@ class MasterControl { Pipeline.createPipeline(pipelineType); glslLibraryAvailable = Pipeline.getPipeline().isGLSLLibraryAvailable(); - assert !(glslLibraryAvailable && cgLibraryAvailable) : - "ERROR: cannot support both GLSL and CG at the same time"; - librariesLoaded = true; } -- cgit v1.2.3