java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 3715
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3715&view=rev
Author:   spasi
Date:     2011-12-20 19:06:52 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Added @Optional on clSetPrintfCallback for the AMD CL 1.2 preview driver.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opencl/CL12.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opencl/CL12.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/CL12.java	2011-12-20 17:16:23 UTC (rev 3714)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/CL12.java	2011-12-20 19:06:52 UTC (rev 3715)
@@ -419,6 +419,7 @@
 	                                 @Check(canBeNull = true) @Const @NativeType("cl_event") PointerBuffer event_wait_list,
 	                                 @OutParameter @Check(value = "1", canBeNull = true) @NativeType("cl_event") PointerBuffer event);
 
+	@Optional(reason = "Missing from AMD CL 1.2 preview drivers.")
 	@Code(
 		tryBlock = true,
 		// Create a GlobalRef to the callback object.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3714
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3714&view=rev
Author:   spasi
Date:     2011-12-20 17:16:23 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Updated AMD_pinned_memory based on official spec.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_pinned_memory.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_pinned_memory.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_pinned_memory.java	2011-12-20 11:04:49 UTC (rev 3713)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_pinned_memory.java	2011-12-20 17:16:23 UTC (rev 3714)
@@ -34,22 +34,10 @@
 public interface AMD_pinned_memory {
 
 	/**
-	 * <strong>Official spec not released yet. Info from AMD developer forums:</strong><br/>
-	 * Create a buffer object, bind it to the GL_EXTERNAL_VIRTUAL_MEMORY_AMD target and call glBufferData to 'allocate' space.
-	 * When the driver sees you do this, it will use the pointer you supply directly rather than copying the data (that is, the
-	 * GPU will access your application's memory). You can then use the buffer for other purposes such as a UBO, TBO or VBO by
-	 * binding it to the appropriate targets. Synchronization is left to the application - make use of glFenceSync and glWaitSync.
-	 * To release the memory, simply call glBufferData again on the buffer object on a different target, or delete the buffer
-	 * object. Don't free the memory in the application until you've detached it from the buffer object or bad stuff will happen.
-	 * <p/>
-	 * Keep in mind that any memory you access will go over the PCIe bus which will be limited to 3-4 GB/s. This will work much
-	 * better on Fusion systems (APUs). Theoretically, there isn't a limit to the amount of memory that can be pinned. However,
-	 * when the OS pins memory, it removes it from the regular pagable pool and cannot swap it to disk (this is what pinning
-	 * means). If you ask for too much, the OS will refuse to do it and the call will fail (the GL driver will return generate
-	 * a GL_OUT_OF_MEMORY error). It is very likely that you'll hit this limit long before you run out of address space on the
-	 * GPU, although in practice we do impose a moderate limit on the amount of pinned memory so as to not impact system stability
-	 * and performance.
+	 * Accepted by the &lt;target&gt; parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
+	 * GetBufferParameteriv, GetBufferPointerv, MapBufferRange:
 	 */
-	int GL_EXTERNAL_VIRTUAL_MEMORY_AMD = 0x9160;
+	int GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD = 0x9160;
 
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3713
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3713&view=rev
Author:   jpilgrim
Date:     2011-12-20 11:04:49 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
StandalonePublisher directly creates jars, no need for additional "jarring".

- added main method to StandalonePublisher creating artifact.xml/jar and content.xml/jar from given (old) Eclise update site.
- when compressed is set to true, artifact.jar and content.jar are created directly. Removed jar task in build script, as these are no longer necessary

Modified Paths:
--------------
    trunk/LWJGL/eclipse-update/org.lwjgl.build/anttasks.jar
    trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml
    trunk/LWJGL/eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java

Modified: trunk/LWJGL/eclipse-update/org.lwjgl.build/anttasks.jar
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml	2011-12-15 19:00:59 UTC (rev 3712)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.build/build-updatesite.xml	2011-12-20 11:04:49 UTC (rev 3713)
@@ -482,18 +482,7 @@
 		updatesitefolder="${eclipse.build.plugins}/org.lwjgl.updatesite"
 		repositoryname="lwjgl.org"
 		repositoryuri="${eclipse.updatesite}" />
-		<jar destfile="${eclipse.build.plugins}/org.lwjgl.updatesite/content.jar">
-			<fileset file="${eclipse.build.plugins}/org.lwjgl.updatesite/content.xml" />
-		</jar>
-		<jar destfile="${eclipse.build.plugins}/org.lwjgl.updatesite/artifacts.jar">
-			<fileset file="${eclipse.build.plugins}/org.lwjgl.updatesite/artifacts.xml" />
-		</jar>
-		<delete>
-			<fileset file="${eclipse.build.plugins}/org.lwjgl.updatesite/content.xml" />
-			<fileset file="${eclipse.build.plugins}/org.lwjgl.updatesite/artifacts.xml" />
-		</delete>
-
-		
+				
 		<echo>Created Eclipse update site: ${eclipse.build.plugins}/org.lwjgl.updatesite</echo>
 	</target>
 

Modified: trunk/LWJGL/eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java	2011-12-15 19:00:59 UTC (rev 3712)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java	2011-12-20 11:04:49 UTC (rev 3713)
@@ -11,15 +11,14 @@
 
 package org.lwjgl.ant;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.math.BigInteger;
-import java.nio.ByteBuffer;
 import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,6 +27,7 @@
 import java.util.Properties;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -626,9 +626,48 @@
 	 * @throws TransformerException
 	 */
 	protected void writeDocument(Document content, String targetFile)
+			throws Exception {
+
+		if (compressed) {
+			String jarFileNameString = targetFile;
+			int pos = jarFileNameString.lastIndexOf('.');
+			if (pos > 0) {
+				jarFileNameString = jarFileNameString.substring(0, pos) + ".jar";
+			} else {
+				jarFileNameString += ".jar";
+			}
+			
+			JarOutputStream target = new JarOutputStream(new FileOutputStream(
+					jarFileNameString));
+			
+			pos = targetFile.lastIndexOf(File.separatorChar);
+			if (pos>0) {
+				targetFile = targetFile.substring(pos+1);
+			}
+
+			JarEntry entry = new JarEntry(targetFile);
+			target.putNextEntry(entry);
+
+			StreamResult sr = new StreamResult(target);
+			doWriteDocument(content, sr);
+			target.closeEntry();
+			target.close();
+		} else {
+			StreamResult sr = new StreamResult(new File(targetFile));
+			doWriteDocument(content, sr);
+		}
+	}
+
+	/**
+	 * @param content
+	 * @param sr
+	 * @throws TransformerFactoryConfigurationError
+	 * @throws TransformerConfigurationException
+	 * @throws TransformerException
+	 */
+	private void doWriteDocument(Document content, StreamResult sr)
 			throws TransformerFactoryConfigurationError,
 			TransformerConfigurationException, TransformerException {
-		StreamResult sr = new StreamResult(new File(targetFile));
 		TransformerFactory tf = TransformerFactory.newInstance();
 		Transformer t = tf.newTransformer();
 		Properties oprops = new Properties();
@@ -1164,12 +1203,83 @@
 	 */
 	public static void main(String[] args) throws Exception {
 		StandalonePublisher publisher = new StandalonePublisher();
-		publisher.updateSiteFolder = "build/plugins/org.lwjgl.updatesite";
-		publisher.repositoryName = "org.lwjgl";
-		publisher.repositoryURI = "http://lwjgl.org/update";
-		publisher.execute();
+
+		if (!publisher.parseArgs(args)) {
+			help();
+		} else {
+			//			publisher.updateSiteFolder = "build/plugins/org.lwjgl.updatesite";
+			//			publisher.repositoryName = "org.lwjgl";
+			//			publisher.repositoryURI = "http://lwjgl.org/update";
+			try {
+				publisher.execute();
+				System.out.println("Successfull created p2 metadata in " + publisher.updateSiteFolder);
+			} catch (Exception ex) {
+				System.err.println("Error creating p2 metadata: ");
+				System.err.println(ex);
+				ex.printStackTrace();
+			}
+		}
 	}
 
+	/**
+	 * 
+	 */
+	static void help() {
+		System.out
+				.println("StandalonePublisher, (C) Jens von Pilgrim 2011 (EPL and BSD license)");
+		System.out
+				.println("Ant task generating p2 metadata for old style Eclipse update site.");
+		System.out
+				.println("Limited support: only bundles and featues are supported, functionality only");
+		System.out.println("  tested for LWJGL update site");
+		System.out
+				.println("If run as command line tool, specify update site folder, repository name");
+		System.out.println("  and URI as follows:");
+		System.out
+				.println("  >java org.ljgl.ant.StandalonePublisher FOLDER NAME URI");
+		System.out
+				.println("Example (supposed tool is called from updatesite folder):");
+		System.out
+				.println("  >java org.lwjgl.ant.StandalonePublisher . org.lwjgl http://lwjgl.org/update");
+		System.out
+				.println("If content.xml and artfact.xml should be compressed, add 'compress'");
+	}
+
+	/**
+	 * @param i_args
+	 * @return
+	 */
+	boolean parseArgs(String[] i_args) {
+		if (i_args == null || i_args.length < 3) {
+			return false;
+		}
+		updateSiteFolder = i_args[0];
+		repositoryName = i_args[1];
+		repositoryURI = i_args[2];
+
+		if (updateSiteFolder.isEmpty() || repositoryName.isEmpty()
+				|| repositoryURI.isEmpty()) {
+			return false;
+		}
+
+		File f = new File(updateSiteFolder);
+		if (!f.exists()) {
+			System.err.println("Update site folder does not exist.");
+			return false;
+		}
+		if (!(repositoryURI.startsWith("http") || repositoryURI
+				.startsWith("file"))) {
+			System.out
+					.println("Warning: Repository URI should start with protocol, e.g., http: or file:");
+		}
+
+		if (i_args.length == 4 && "compress".equalsIgnoreCase(i_args[3])) {
+			compressed = true;
+		}
+
+		return true;
+	}
+
 	/** 
 	 * {@inheritDoc}
 	 * @see org.apache.tools.ant.Task#execute()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.