diff options
| author | Kenneth Russel <[email protected]> | 2004-04-22 01:46:55 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2004-04-22 01:46:55 +0000 |
| commit | 6ea7e2388164abd26aa8a88ffe615fb6e7780ee6 (patch) | |
| tree | bdd2035f3f7894260ea8a79e242bf50af54c2f22 /src | |
| parent | c8440fcccaa8b306c8b52acf384fa14daec95f5c (diff) | |
Fixed problems in WindowsGLContext and TraceGL pointed out by jonmeyer
on JOGL forums
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@114 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/java/games/gluegen/opengl/BuildComposablePipeline.java | 1 | ||||
| -rw-r--r-- | src/net/java/games/jogl/impl/windows/WindowsGLContext.java | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/net/java/games/gluegen/opengl/BuildComposablePipeline.java b/src/net/java/games/gluegen/opengl/BuildComposablePipeline.java index d3f9a4603..230add51a 100644 --- a/src/net/java/games/gluegen/opengl/BuildComposablePipeline.java +++ b/src/net/java/games/gluegen/opengl/BuildComposablePipeline.java @@ -473,6 +473,7 @@ public class BuildComposablePipeline output.println("private int indent = 0;"); output.println("protected String dumpArray(Object obj)"); output.println("{"); + output.println(" if (obj == null) return \"[null]\";"); output.println(" StringBuffer sb = new StringBuffer(\"[\");"); output.println(" int len = java.lang.reflect.Array.getLength(obj);"); output.println(" int count = Math.min(len,16);"); diff --git a/src/net/java/games/jogl/impl/windows/WindowsGLContext.java b/src/net/java/games/jogl/impl/windows/WindowsGLContext.java index 2ff6769b9..5d53b21d8 100644 --- a/src/net/java/games/jogl/impl/windows/WindowsGLContext.java +++ b/src/net/java/games/jogl/impl/windows/WindowsGLContext.java @@ -270,7 +270,14 @@ public abstract class WindowsGLContext extends GLContext { // It seems that at this point in initialization, // glGetString(GL.GL_EXTENSIONS) is returning null, so we // need to use wglGetExtensionsStringARB - String availableWGLExtensions = dummyGL.wglGetExtensionsStringARB(hdc); + String availableWGLExtensions = ""; + // FIXME: would like to do this operation without throwing an + // exception if wglGetExtensionsStringARB isn't available + try { + availableWGLExtensions = dummyGL.wglGetExtensionsStringARB(hdc); + } catch (GLException e) { + // Apparently wglGetExtensionsStringARB wasn't available; ignore + } if (availableWGLExtensions.indexOf("WGL_ARB_pixel_format") >= 0) { haveWGLChoosePixelFormatARB = true; if (availableWGLExtensions.indexOf("WGL_ARB_multisample") >= 0) { |