aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChien Yang <[email protected]>2007-03-09 22:17:37 +0000
committerChien Yang <[email protected]>2007-03-09 22:17:37 +0000
commit57eed97fba0f6c94ac4247f55f9600ff26082218 (patch)
tree113d51097a8dfc4d0fb2250dbe66334e8acd5a53
parentc1ad5aac9f0ad6e1bed67c7a588c9463be71edf0 (diff)
Fixed a typo in native pipe.
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@795 ba19aa83-45c5-6ac9-afd3-db810772062c
-rw-r--r--src/classes/jogl/javax/media/j3d/JoglPipeline.java13
-rw-r--r--src/native/ogl/Canvas3D.c15
2 files changed, 13 insertions, 15 deletions
diff --git a/src/classes/jogl/javax/media/j3d/JoglPipeline.java b/src/classes/jogl/javax/media/j3d/JoglPipeline.java
index 1d7d36a..c13c5ac 100644
--- a/src/classes/jogl/javax/media/j3d/JoglPipeline.java
+++ b/src/classes/jogl/javax/media/j3d/JoglPipeline.java
@@ -8418,13 +8418,12 @@ class JoglPipeline extends Pipeline {
if (major == 1) {
if (minor == 2) {
System.err.println("JAVA 3D: OpenGL 1.2 detected; will run with reduced functionality");
- } else {
- if (minor >= 3) {
- gl13 = true;
- }
- if (minor >= 4) {
- gl14 = true;
- }
+ }
+ if (minor >= 3) {
+ gl13 = true;
+ }
+ if (minor >= 4) {
+ gl14 = true;
}
} else /* major >= 2 */ {
gl13 = true;
diff --git a/src/native/ogl/Canvas3D.c b/src/native/ogl/Canvas3D.c
index 0b412f4..37c8b9f 100644
--- a/src/native/ogl/Canvas3D.c
+++ b/src/native/ogl/Canvas3D.c
@@ -603,17 +603,16 @@ getPropertiesFromCurrentContext(
return JNI_FALSE;
}
- if (versionNumbers[0] > 1) {
+ if (versionNumbers[0] == 1) {
if (versionNumbers[1] == 2) {
fprintf(stderr,
"JAVA 3D: OpenGL 1.2 detected; will run with reduced functionality\n");
- } else {
- if (versionNumbers[1] >= 3) {
- ctxInfo->gl13 = JNI_TRUE;
- }
- if (versionNumbers[1] >= 4) {
- ctxInfo->gl14 = JNI_TRUE;
- }
+ }
+ if (versionNumbers[1] >= 3) {
+ ctxInfo->gl13 = JNI_TRUE;
+ }
+ if (versionNumbers[1] >= 4) {
+ ctxInfo->gl14 = JNI_TRUE;
}
} else /* major >= 2 */ {
ctxInfo->gl20 = JNI_TRUE;