Merged with current JOGL trunk (by using -r HEAD)

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@262 232f8b59-042b-4e1e-8c03-345bb8c30851

7 files changed, 55 insertions, 1 deletions

diff --git a/make/build.xml b/make/build.xml
index 7ce104390..604c33849 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -202,6 +202,7 @@
         <property name="java.lib.dir.win32" value="${java.home.dir}/lib" />
         <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />
         <property name="java.lib.dir.linux.amd64" value="${java.home.dir}/jre/lib/amd64" />
+        <property name="java.lib.dir.linux.ia64" value="${java.home.dir}/jre/lib/ia64" />
 	<condition property="cpu" value="sparc">
             <os name="SunOS" arch="sparc" />
         </condition>
@@ -321,6 +322,15 @@
         <property name="linker.cfg.id"                        value="linker.cfg.linux.amd64" /> 
     </target>
     
+    <target name="declare.linux.ia64" depends="declare.x11">
+        <property name="java.includes.dir.platform"           value="${java.includes.dir.linux}" />
+        <property name="java.lib.dir.platform"                value="${java.lib.dir.linux.ia64}" />       
+
+        <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
+        <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
+    </target>
+
+
     <target name="declare.freebsd" depends="declare.x11">
         <property name="java.includes.dir.platform"           value="${java.includes.dir.freebsd}" />
         <property name="java.lib.dir.platform"                value="${java.lib.dir.linux}" />
@@ -877,6 +887,9 @@
     <target name="c.compile.jogl.linux.amd64" depends="declare.linux.amd64, c.build.jogl, c.build.cg" >
     </target>
     
+    <target name="c.compile.jogl.linux.ia64" depends="declare.linux.ia64, c.build.jogl, c.build.cg" >
+    </target>
+
     <target name="c.compile.jogl.solaris" depends="declare.solaris, c.build.jogl">
     </target>
     
@@ -1036,7 +1049,7 @@
     <target name="all">
         <fail>
         
-Use a platform specific target:  linux, linux.amd64, macosx, solaris, win32.vc6, win32.vc7, win32.mingw
+Use a platform specific target:  linux, linux.amd64, linux.ia64, macosx, solaris, win32.vc6, win32.vc7, win32.mingw
         </fail>
     </target>      
 
@@ -1095,6 +1108,17 @@ Use a platform specific target:  linux, linux.amd64, macosx, solaris, win32.vc6,
         <antcall target="c.compile.jogl.linux.amd64" />
     </target>
 
+     <!--
+       - Linux on IA64 (assuming GCC)
+      -->
+    <target name="linux.ia64" depends="setup.java.home.dir.nonmacosx, declare.linux.ia64">
+        <!-- Generate, compile, and build the jar for the Java sources. -->
+        <antcall target="jar" inheritRefs="true" />
+
+        <!-- Compile the native C sources and build the jogl lib. -->
+        <antcall target="c.compile.jogl.linux.ia64" />
+    </target>
+
     <!--
         - Solaris (assuming Solaris CC)
       -->
diff --git a/make/cgl-macosx.cfg b/make/cgl-macosx.cfg
index c7a7f3841..dab1ec206 100644
--- a/make/cgl-macosx.cfg
+++ b/make/cgl-macosx.cfg
@@ -45,6 +45,8 @@ CustomCCode extern void setContextTextureImageToPBuffer(void* nsContext, void* p
 
 CustomCCode extern void* getProcAddress(const char *procName);
 
+CustomCCode extern void setSwapInterval(void* nsContext, int interval);
+
 # Implement the first argument to getProcAddress as String instead
 # of byte[]
 ArgumentIsString getProcAddress 0
diff --git a/make/gl-common.cfg b/make/gl-common.cfg
index a2f091f43..da4d7ea17 100644
--- a/make/gl-common.cfg
+++ b/make/gl-common.cfg
@@ -343,6 +343,16 @@ CustomJavaCode GL    * {@link GLX#glXAllocateMemoryNV} extension.
 CustomJavaCode GL    */
 CustomJavaCode GL   public java.nio.ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3);
 
+CustomJavaCode GL   /** Provides a platform-independent way to specify the minimum swap
+CustomJavaCode GL       interval for buffer swaps. An argument of 0 disables
+CustomJavaCode GL       sync-to-vertical-refresh completely, while an argument of 1
+CustomJavaCode GL       causes the application to wait until the next vertical refresh
+CustomJavaCode GL       until swapping buffers. The default, which is platform-specific,
+CustomJavaCode GL       is usually either 0 or 1. This function is not guaranteed to
+CustomJavaCode GL       have an effect, and in particular only affects heavyweight
+CustomJavaCode GL       onscreen components. */
+CustomJavaCode GL   public void setSwapInterval(int interval);
+
 #
 # Directives needed when processing wglext.h on Windows and other platforms
 #
diff --git a/make/gl-impl-macosx.cfg b/make/gl-impl-macosx.cfg
index 8ce128851..5a09750dd 100644
--- a/make/gl-impl-macosx.cfg
+++ b/make/gl-impl-macosx.cfg
@@ -73,5 +73,9 @@ CustomJavaCode MacOSXGLImpl    // FIXME
 CustomJavaCode MacOSXGLImpl    throw new GLException("Not yet implemented");
 CustomJavaCode MacOSXGLImpl  }
 
+CustomJavaCode MacOSXGLImpl  public void setSwapInterval(int interval) { // FIXME: not implemented yet
+CustomJavaCode MacOSXGLImpl  	_context.setSwapInterval(interval);
+CustomJavaCode MacOSXGLImpl  }
+
 IncludeAs CustomJavaCode MacOSXGLImpl gl-impl-CustomJavaCode.java
 IncludeAs CustomCCode gl-impl-CustomCCode.c
diff --git a/make/gl-impl-win32.cfg b/make/gl-impl-win32.cfg
index bf4f93998..252425659 100644
--- a/make/gl-impl-win32.cfg
+++ b/make/gl-impl-win32.cfg
@@ -60,5 +60,11 @@ CustomJavaCode WindowsGLImpl   public java.nio.ByteBuffer glAllocateMemoryNV(int
 CustomJavaCode WindowsGLImpl     return wglAllocateMemoryNV(arg0, arg1, arg2, arg3);
 CustomJavaCode WindowsGLImpl   }
 
+CustomJavaCode WindowsGLImpl   public void setSwapInterval(int interval) {
+CustomJavaCode WindowsGLImpl     if (isExtensionAvailable("WGL_EXT_swap_control")) {
+CustomJavaCode WindowsGLImpl       wglSwapIntervalEXT(interval);
+CustomJavaCode WindowsGLImpl     }
+CustomJavaCode WindowsGLImpl   }
+
 IncludeAs CustomJavaCode WindowsGLImpl gl-impl-CustomJavaCode.java
 IncludeAs CustomCCode gl-impl-CustomCCode.c
diff --git a/make/gl-impl-x11.cfg b/make/gl-impl-x11.cfg
index 33527d351..b60a28787 100644
--- a/make/gl-impl-x11.cfg
+++ b/make/gl-impl-x11.cfg
@@ -57,5 +57,11 @@ CustomJavaCode X11GLImpl   public java.nio.ByteBuffer glAllocateMemoryNV(int arg
 CustomJavaCode X11GLImpl     return glXAllocateMemoryNV(arg0, arg1, arg2, arg3);
 CustomJavaCode X11GLImpl   }
 
+CustomJavaCode X11GLImpl   public void setSwapInterval(int interval) {
+CustomJavaCode X11GLImpl     if (isExtensionAvailable("GLX_SGI_swap_control")) {
+CustomJavaCode X11GLImpl       glXSwapIntervalSGI(interval);
+CustomJavaCode X11GLImpl     }
+CustomJavaCode X11GLImpl   }
+
 IncludeAs CustomJavaCode X11GLImpl gl-impl-CustomJavaCode.java
 IncludeAs CustomCCode gl-impl-CustomCCode.c
diff --git a/make/stub_includes/macosx/window-system.c b/make/stub_includes/macosx/window-system.c
index e5ba4307f..b30c252f3 100644
--- a/make/stub_includes/macosx/window-system.c
+++ b/make/stub_includes/macosx/window-system.c
@@ -32,3 +32,5 @@ void setContextPBuffer(void* nsContext, void* pBuffer);
 void setContextTextureImageToPBuffer(void* nsContext, void* pBuffer, int colorBuffer);
 
 void* getProcAddress(const char *procName);
+
+void setSwapInterval(void* nsContext, int interval);