diff options
| author | Chien Yang <[email protected]> | 2005-02-14 20:54:30 +0000 |
|---|---|---|
| committer | Chien Yang <[email protected]> | 2005-02-14 20:54:30 +0000 |
| commit | a606b2163bba30d9ab9ce3bc6ca08b1f7dd18f2d (patch) | |
| tree | 669d7d49c1a6f1259b433848bd4a89c507b745f8 /src/classes | |
| parent | d5602c854548a67bf11adf339a5f87cd3bce5505 (diff) | |
1) Fixed to issue 97 - ATI video card related - Lockup, lose hardware acceleration and crash OS.
2) Fixed to issue 98 - Random Lockup when adding a Canvas3D to JTabbedPane.
3) Partial fix to issue 100 - Offscreen Capture crash JVM.
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@120 ba19aa83-45c5-6ac9-afd3-db810772062c
Diffstat (limited to 'src/classes')
| -rw-r--r-- | src/classes/share/javax/media/j3d/Canvas3D.java | 3 | ||||
| -rw-r--r-- | src/classes/win32/javax/media/j3d/NativeConfigTemplate3D.java | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/classes/share/javax/media/j3d/Canvas3D.java b/src/classes/share/javax/media/j3d/Canvas3D.java index 4261c1f..9a78a21 100644 --- a/src/classes/share/javax/media/j3d/Canvas3D.java +++ b/src/classes/share/javax/media/j3d/Canvas3D.java @@ -1133,7 +1133,8 @@ public class Canvas3D extends Canvas { this.graphicsConfiguration = graphicsConfiguration; // Needed for Win32 only. - vid = nativeWSobj.getCanvasVid(graphicsConfiguration); + // Fix to issue 97 -- We will stop using vid. Need to cleanup code. + vid = 0; // Fix for issue 20. // Needed for Linux and Solaris. diff --git a/src/classes/win32/javax/media/j3d/NativeConfigTemplate3D.java b/src/classes/win32/javax/media/j3d/NativeConfigTemplate3D.java index 3a92b8a..f52223f 100644 --- a/src/classes/win32/javax/media/j3d/NativeConfigTemplate3D.java +++ b/src/classes/win32/javax/media/j3d/NativeConfigTemplate3D.java @@ -110,7 +110,11 @@ class NativeConfigTemplate3D { return null; } - GraphicsConfiguration gc1 = new J3dGraphicsConfig(gd, pixelFormat); + // Fix to issue 97 -- + // Pass in 0 for pixel format to the AWT. + // ATI driver will lockup pixelFormat, if it is passed to AWT. + GraphicsConfiguration gc1 = new J3dGraphicsConfig(gd, 0); + // We need to cache the offScreen pixelformat that glXChoosePixelFormat() // returns, since this is not cached with J3dGraphicsConfig and there // are no public constructors to allow us to extend it. |