From a84d004aa9539731b5d5daa382c1ca20c5c2b2c2 Mon Sep 17 00:00:00 2001 From: Chien Yang Date: Fri, 9 Mar 2007 18:51:09 +0000 Subject: Update ogl native and set gl13 to true too. git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@793 ba19aa83-45c5-6ac9-afd3-db810772062c --- src/classes/jogl/javax/media/j3d/JoglPipeline.java | 1 + src/native/ogl/Canvas3D.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/classes/jogl/javax/media/j3d/JoglPipeline.java b/src/classes/jogl/javax/media/j3d/JoglPipeline.java index 6d7ba95..9d8a678 100644 --- a/src/classes/jogl/javax/media/j3d/JoglPipeline.java +++ b/src/classes/jogl/javax/media/j3d/JoglPipeline.java @@ -8424,6 +8424,7 @@ class JoglPipeline extends Pipeline { System.err.println("JAVA 3D: OpenGL 1.2 detected; will run with reduced functionality"); } else if ( minor == 4 ) { gl14 = true; + gl13 = true; } else { gl13 = true; diff --git a/src/native/ogl/Canvas3D.c b/src/native/ogl/Canvas3D.c index 39d328c..0d50ff1 100644 --- a/src/native/ogl/Canvas3D.c +++ b/src/native/ogl/Canvas3D.c @@ -613,6 +613,9 @@ getPropertiesFromCurrentContext( if (versionNumbers[1] == 2) { fprintf(stderr, "JAVA 3D: OpenGL 1.2 detected; will run with reduced functionality\n"); + } else if (versionNumbers[1] == 4) { + ctxInfo->gl14 = JNI_TRUE; + ctxInfo->gl13 = JNI_TRUE; } else { // OpenGL 1.x (1.3 or greater) ctxInfo->gl13 = JNI_TRUE; -- cgit v1.2.3