Modified Files:

	jogl/make/gl-common.cfg jogl/make/gl-glx-common.cfg
jogl/src/net/java/games/gluegen/opengl/JavaGLPAWrapperEmitter.java
jogl/src/net/java/games/gluegen/runtime/BufferFactory.java
jogl/src/net/java/games/gluegen/JavaEmitter.java
jogl/src/net/java/games/gluegen/JavaConfiguration.java
jogl/src/net/java/games/gluegen/CMethodBindingEmitter.java
jogl/src/net/java/games/gluegen/JavaMethodBindingEmitter.java
jogl/src/net/java/games/gluegen/CMethodBindingImplEmitter.java
jogl/src/net/java/games/gluegen/JavaMethodBindingImplEmitter.java
jogl/src/net/java/games/jogl/util/BufferUtils.java

Changes:

  * Add NIODirectOnly grammar for description of methods that should have
     only NIO Direct Buffer option (no expansion into other types, and also will
     not be expanded to include indirect Buffer when we add that functionality)

  * Make changes to respect Direct Buffer position value.  This allows a setting
     of an internal Buffer object parameter and JOGL will start reading data at
     the point in the buffer to which this position is set

  * The code is now generated to always respect this offset option.  This has the
      affect of changing the internal signatures of all methods that use Buffers.  But
      it does not affect the external API at all.

   * Old JOGL programs will continue working the same as long as they had the
      Buffer position set to zero before (the default value)


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

1 files changed, 6 insertions, 6 deletions

diff --git a/src/net/java/games/gluegen/JavaConfiguration.java b/src/net/java/games/gluegen/JavaConfiguration.java
index 73aebb5a8..e4bc0278b 100644
--- a/src/net/java/games/gluegen/JavaConfiguration.java
+++ b/src/net/java/games/gluegen/JavaConfiguration.java
@@ -119,7 +119,7 @@ public class JavaConfiguration {
   private Set/*<Pattern>*/ ignores = new HashSet();
   private Set/*<Pattern>*/ ignoreNots = new HashSet();
   private Set/*<Pattern>*/ unimplemented = new HashSet();
-  private Set/*<String>*/ nioOnly = new HashSet();
+  private Set/*<String>*/ nioDirectOnly = new HashSet();
   /** See {@link #nioMode} */
   public static final int NIO_MODE_VOID_ONLY = 1;
   /** See {@link #nioMode} */
@@ -363,8 +363,8 @@ public class JavaConfiguration {
   /** Returns true if the given function should only create a java.nio
       variant, and no array variants, for <code>void*</code> and other
       C primitive pointers. */
-  public boolean nioOnly(String functionName) {
-    return nioOnly.contains(functionName);
+  public boolean nioDirectOnly(String functionName) {
+    return nioDirectOnly.contains(functionName);
   }
 
   /** Returns true if the user requested that the given function
@@ -674,8 +674,8 @@ public class JavaConfiguration {
       readClassJavadoc(tok, filename, lineNo);
       // Warning: make sure delimiters are reset at the top of this loop
       // because readClassJavadoc changes them.
-    } else if (cmd.equalsIgnoreCase("NioOnly")) {
-      nioOnly.add(readString("NioOnly", tok, filename, lineNo));
+    } else if (cmd.equalsIgnoreCase("NioDirectOnly")) {
+      nioDirectOnly.add(readString("NioDirectOnly", tok, filename, lineNo));
     } else if (cmd.equalsIgnoreCase("NoNio")) {
       noNio.add(readString("NoNio", tok, filename, lineNo));
     } else if (cmd.equalsIgnoreCase("ForcedNio")) {
@@ -909,7 +909,7 @@ public class JavaConfiguration {
    * other types (i.e., <code>int*</code>) will have java.nio variants
    * generated for them (i.e., <code>IntBuffer</code> as opposed to
    * merely <code>int[]</code>). This default mode can be overridden
-   * with the NioOnly and NoNio directives. The default for this mode
+   * with the NioDirectOnly and NoNio directives. The default for this mode
    * is currently VOID_ONLY.
    */
   protected void readNioMode(StringTokenizer tok, String filename, int lineNo) {