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

2 files changed, 4 insertions, 4 deletions

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");