diff options
| author | Kevin Rushforth <[email protected]> | 2006-10-04 23:33:25 +0000 |
|---|---|---|
| committer | Kevin Rushforth <[email protected]> | 2006-10-04 23:33:25 +0000 |
| commit | 12427076a5b420b2afba3a34c6ed0f260f6fa2f4 (patch) | |
| tree | 5ac4faee2401d1a810bfc0017ebfc04074869c3c | |
| parent | c82aa7449e2ddd9313d595f0a8be9604e3136582 (diff) | |
Source code changes for issue 358: Document that OGL 1.2 is supported, but at reduced functionality
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@709 ba19aa83-45c5-6ac9-afd3-db810772062c
| -rw-r--r-- | src/classes/jogl/javax/media/j3d/JoglPipeline.java | 9 | ||||
| -rw-r--r-- | src/native/ogl/Canvas3D.c | 8 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/classes/jogl/javax/media/j3d/JoglPipeline.java b/src/classes/jogl/javax/media/j3d/JoglPipeline.java index 3557c32..568b676 100644 --- a/src/classes/jogl/javax/media/j3d/JoglPipeline.java +++ b/src/classes/jogl/javax/media/j3d/JoglPipeline.java @@ -8336,8 +8336,8 @@ class JoglPipeline extends Pipeline { // Reset all fields cv.multiTexAccelerated = false; - cv.maxTextureUnits = 0; - cv.maxTexCoordSets = 0; + cv.maxTextureUnits = 1; + cv.maxTexCoordSets = 1; cv.maxTextureImageUnits = 0; cv.maxVertexTextureImageUnits = 0; cv.maxCombinedTextureImageUnits = 0; @@ -8393,10 +8393,7 @@ class JoglPipeline extends Pipeline { gl13 = true; } else { if (minor == 2) { - System.err.println("*********************************************************"); - System.err.println("*** JAVA 3D: WARNING OpenGL 1.2 is no longer supported."); - System.err.println("*** Will attempt to run with reduced functionality."); - System.err.println("*********************************************************"); + System.err.println("JAVA 3D: OpenGL 1.2 detected; will run with reduced functionality"); } else { gl13 = true; } diff --git a/src/native/ogl/Canvas3D.c b/src/native/ogl/Canvas3D.c index b6cb469..f3bb2da 100644 --- a/src/native/ogl/Canvas3D.c +++ b/src/native/ogl/Canvas3D.c @@ -607,13 +607,7 @@ getPropertiesFromCurrentContext( else { if (versionNumbers[1] == 2) { fprintf(stderr, - "*********************************************************\n"); - fprintf(stderr, - "*** JAVA 3D: WARNING OpenGL 1.2 is no longer supported.\n"); - fprintf(stderr, - "*** Will attempt to run with reduced functionality.\n"); - fprintf(stderr, - "*********************************************************\n"); + "JAVA 3D: OpenGL 1.2 detected; will run with reduced functionality\n"); } else { // OpenGL 1.x (1.3 or greater) ctxInfo->gl13 = JNI_TRUE; |