diff options
| author | Sven Gothel <[email protected]> | 2012-01-14 15:58:20 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-01-14 15:58:20 +0100 |
| commit | 3154801a0054de2dba775902f3da04c96638bb27 (patch) | |
| tree | 42e27f213b475c91686bd043c6a289ee7449c3a9 /src/jogl/classes/com/jogamp | |
| parent | d109c311a49fc31f8656df54eb80e3599e666b33 (diff) | |
Minor Edits: Add GL_RENDERER to JoglVersion dump; Fix typo in PMVMatrix.
Diffstat (limited to 'src/jogl/classes/com/jogamp')
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/JoglVersion.java | 8 | ||||
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java index 8cb25174c..5172cccbd 100644 --- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java +++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java @@ -30,10 +30,10 @@ package com.jogamp.opengl; import com.jogamp.common.GlueGenVersion; import javax.media.opengl.*; + import com.jogamp.common.os.Platform; import com.jogamp.common.util.VersionUtil; import com.jogamp.common.util.JogampVersion; -import com.jogamp.nativewindow.NativeWindowVersion; import java.util.jar.Manifest; import javax.media.nativewindow.AbstractGraphicsDevice; @@ -89,10 +89,12 @@ public class JoglVersion extends JogampVersion { sb.append(Platform.getNewline()); sb.append("GL ").append(gl); sb.append(Platform.getNewline()); - sb.append("GL_VENDOR ").append(gl.glGetString(gl.GL_VENDOR)); + sb.append("GL_VENDOR ").append(gl.glGetString(GL.GL_VENDOR)); sb.append(Platform.getNewline()); - sb.append("GL_VERSION ").append(gl.glGetString(gl.GL_VERSION)); + sb.append("GL_RENDERER ").append(gl.glGetString(GL.GL_RENDERER)); sb.append(Platform.getNewline()); + sb.append("GL_VERSION ").append(gl.glGetString(GL.GL_VERSION)); + sb.append(Platform.getNewline()); sb.append("GL_EXTENSIONS "); sb.append(Platform.getNewline()); sb.append(" ").append(ctx.getGLExtensionsString()); diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java index a86a2f435..286c70e54 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java +++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java @@ -64,7 +64,7 @@ public class PMVMatrix implements GLMatrixFunc { * In most Java implementations, direct NIO buffers have no backing array * and hence the Java computation will be throttled down by direct IO get/put * operations.</p> - * <p>Depending on the application, ie. weather the Java computation or + * <p>Depending on the application, ie. whether the Java computation or * JNI invocation and hence native data transfer part is heavier, * this flag shall be set to <code>true</code> or <code>false</code></p>. */ |