From cf7b8b87f78687b8e4a867d3b18bd7f072a955ee Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Wed, 9 Nov 2005 00:32:37 +0000 Subject: Refactored computations of sizes of data types and offsets of fields in data structures in GlueGen to be performed lazily via SizeThunks. The concrete size of primitive data types is computed only by passing a MachineDescription into one of these thunks. Changed generated glue code for struct accessors to delegate their instantiation and field access to specialized 32- or 64-bit versions. This should allow one jar file to support both 32-bit and 64-bit CPUs; the native code is of course still specialized for the processor and data model. Changed default build to generate both 32-bit and 64-bit accessors for all generated data structures. Tested on Windows; more testing, including build testing, is needed on other platforms. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@426 232f8b59-042b-4e1e-8c03-345bb8c30851 --- src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java | 2 +- src/classes/com/sun/opengl/impl/windows/WindowsOffscreenGLDrawable.java | 2 +- src/classes/com/sun/opengl/impl/windows/WindowsOnscreenGLDrawable.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/classes/com/sun/opengl/impl/windows') diff --git a/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java index ae95f5505..abbc9a511 100644 --- a/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java +++ b/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java @@ -379,7 +379,7 @@ public abstract class WindowsGLDrawable extends GLDrawableImpl { } static PIXELFORMATDESCRIPTOR newPixelFormatDescriptor() { - PIXELFORMATDESCRIPTOR pfd = new PIXELFORMATDESCRIPTOR(); + PIXELFORMATDESCRIPTOR pfd = PIXELFORMATDESCRIPTOR.create(); pfd.nSize((short) pfd.size()); pfd.nVersion((short) 1); return pfd; diff --git a/src/classes/com/sun/opengl/impl/windows/WindowsOffscreenGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsOffscreenGLDrawable.java index 7dd6d2361..a128ea1a4 100644 --- a/src/classes/com/sun/opengl/impl/windows/WindowsOffscreenGLDrawable.java +++ b/src/classes/com/sun/opengl/impl/windows/WindowsOffscreenGLDrawable.java @@ -76,7 +76,7 @@ public class WindowsOffscreenGLDrawable extends WindowsGLDrawable { } private void create() { - BITMAPINFO info = new BITMAPINFO(); + BITMAPINFO info = BITMAPINFO.create(); BITMAPINFOHEADER header = info.bmiHeader(); int bitsPerPixel = (capabilities.getRedBits() + capabilities.getGreenBits() + diff --git a/src/classes/com/sun/opengl/impl/windows/WindowsOnscreenGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsOnscreenGLDrawable.java index b1f2d57a1..fa3766a80 100644 --- a/src/classes/com/sun/opengl/impl/windows/WindowsOnscreenGLDrawable.java +++ b/src/classes/com/sun/opengl/impl/windows/WindowsOnscreenGLDrawable.java @@ -186,7 +186,7 @@ public class WindowsOnscreenGLDrawable extends WindowsGLDrawable { private JAWT getJAWT() { if (jawt == null) { - JAWT j = new JAWT(); + JAWT j = JAWT.create(); j.version(JAWTFactory.JAWT_VERSION_1_4); if (!JAWTFactory.JAWT_GetAWT(j)) { throw new RuntimeException("Unable to initialize JAWT"); -- cgit v1.2.3