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

7 files changed, 10 insertions, 10 deletions

diff --git a/src/classes/com/sun/opengl/impl/NativeLibLoader.java b/src/classes/com/sun/opengl/impl/NativeLibLoader.java
index fa535c7d5..6d4815cd7 100644
--- a/src/classes/com/sun/opengl/impl/NativeLibLoader.java
+++ b/src/classes/com/sun/opengl/impl/NativeLibLoader.java
@@ -79,7 +79,7 @@ public class NativeLibLoader {
             // Workaround for 4845371.
             // Make sure the first reference to the JNI GetDirectBufferAddress is done
             // from a privileged context so the VM's internal class lookups will succeed.
-            JAWT jawt = new JAWT();
+            JAWT jawt = JAWT.create();
             JAWTFactory.JAWT_GetAWT(jawt);
 
             return null;
diff --git a/src/classes/com/sun/opengl/impl/macosx/MacOSXOnscreenGLDrawable.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXOnscreenGLDrawable.java
index e7f6537b9..4d0f16623 100644
--- a/src/classes/com/sun/opengl/impl/macosx/MacOSXOnscreenGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXOnscreenGLDrawable.java
@@ -215,7 +215,7 @@ public class MacOSXOnscreenGLDrawable extends MacOSXGLDrawable {
   {
     if (jawt == null)
       {
-	JAWT j = new JAWT();
+	JAWT j = JAWT.create();
 	j.version(JAWTFactory.JAWT_VERSION_1_4);
 	if (!JAWTFactory.JAWT_GetAWT(j))
 	  {
@@ -225,4 +225,4 @@ public class MacOSXOnscreenGLDrawable extends MacOSXGLDrawable {
       }
     return jawt;
   }
-}
\ No newline at end of file
+}
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");
diff --git a/src/classes/com/sun/opengl/impl/x11/X11GLDrawable.java b/src/classes/com/sun/opengl/impl/x11/X11GLDrawable.java
index 1d4f5389b..343931965 100644
--- a/src/classes/com/sun/opengl/impl/x11/X11GLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11GLDrawable.java
@@ -100,7 +100,7 @@ public abstract class X11GLDrawable extends GLDrawableImpl {
       // use XGetVisualInfo with a VisualIDMask to get the
       // corresponding XVisualInfo to pass into glXChooseVisual.
       int[] count = new int[1];
-      XVisualInfo template = new XVisualInfo();
+      XVisualInfo template = XVisualInfo.create();
       // FIXME: probably not 64-bit clean
       template.visualid((int) visualID);
       lockAWT();
@@ -122,7 +122,7 @@ public abstract class X11GLDrawable extends GLDrawableImpl {
       int screen = 0; // FIXME: provide way to specify this?
       XVisualInfo vis = null;
       int[] count = new int[1];
-      XVisualInfo template = new XVisualInfo();
+      XVisualInfo template = XVisualInfo.create();
       template.screen(screen);
       XVisualInfo[] infos = null;
       GLCapabilities[] caps = null;
diff --git a/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java b/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java
index f4523c95e..38d63f04d 100644
--- a/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java
@@ -105,7 +105,7 @@ public class X11GLDrawableFactory extends GLDrawableFactoryImpl {
       long display = getDisplayConnection();
       XVisualInfo recommendedVis = GLX.glXChooseVisual(display, screen, attribs, 0);
       int[] count = new int[1];
-      XVisualInfo template = new XVisualInfo();
+      XVisualInfo template = XVisualInfo.create();
       template.screen(screen);
       infos = GLX.XGetVisualInfo(display, GLX.VisualScreenMask, template, count, 0);
       if (infos == null) {
@@ -347,7 +347,7 @@ public class X11GLDrawableFactory extends GLDrawableFactoryImpl {
   private static JAWT jawt;
   public static 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");