aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <[email protected]>2012-05-03 17:10:37 -0700
committerHarvey Harrison <[email protected]>2012-05-03 17:10:37 -0700
commit9d3ff706567b17c55cbe8e8949914c1da02aee16 (patch)
tree833ae3209a2a80f46006c526ea9c64a2626adab6
parent7d4db9e9f98a3dd2317b6a8d0289e16ee60c2f0e (diff)
j3dcore: remove static feature boolean for CG library
Signed-off-by: Harvey Harrison <[email protected]>
-rw-r--r--src/classes/share/javax/media/j3d/MasterControl.java4
1 files changed, 0 insertions, 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;
}