Bug 1135 - Cleanup: Remove GL_NV_vertex_array_range extension support in GLContext

6 files changed, 4 insertions, 88 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/GLBase.java b/src/jogl/classes/com/jogamp/opengl/GLBase.java
index 19b7808fc..b6704e6ba 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLBase.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLBase.java
@@ -61,19 +61,11 @@ package com.jogamp.opengl;
  *
  * <UL>
  *
- * <LI> The memory allocators for the NVidia vertex_array_range (VAR)
- * extension, in particular <code>wglAllocateMemoryNV</code> /
- * <code>glXAllocateMemoryNV</code> and associated routines. {@link
- * #glAllocateMemoryNV} has been provided for window system-independent
- * access to VAR. {@link #isFunctionAvailable} will translate an argument
- * of "glAllocateMemoryNV" or "glFreeMemoryNV" into the appropriate
- * window system-specific name. </P>
- *
  * <LI> WGL_ARB_pbuffer, WGL_ARB_pixel_format, and other
  * platform-specific pbuffer functionality; the availability of
  * pbuffers can be queried on Windows, X11 and Mac OS X platforms by
  * querying {@link #isExtensionAvailable} with an argument of
- * "GL_ARB_pbuffer" or "GL_ARB_pixel_format".
+ * "GL_ARB_pbuffer" or "GL_ARB_pixel_format".</LI>
  *
  * </UL> <P>
  *
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index 1ff64725a..928ed0284 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -1315,27 +1315,8 @@ public abstract class GLContextImpl extends GLContext {
    */
   public abstract ProcAddressTable getPlatformExtProcAddressTable();
 
-  /**
-   * Part of <code>GL_NV_vertex_array_range</code>.
-   * <p>
-   * Provides platform-independent access to the <code>wglAllocateMemoryNV</code> /
-   * <code>glXAllocateMemoryNV</code>.
-   * </p>
-   */
-  public abstract ByteBuffer glAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority);
-
-  /**
-   * Part of <code>GL_NV_vertex_array_range</code>.
-   * <p>
-   * Provides platform-independent access to the <code>wglFreeMemoryNV</code> /
-   * <code>glXFreeMemoryNV</code>.
-   * </p>
-   */
-  public abstract void glFreeMemoryNV(ByteBuffer pointer);
-
   /** Maps the given "platform-independent" function name to a real function
-      name. Currently this is only used to map "glAllocateMemoryNV" and
-      associated routines to wglAllocateMemoryNV / glXAllocateMemoryNV. */
+      name. Currently not used. */
   protected final String mapToRealGLFunctionName(final String glFunctionName) {
     final Map<String, String> map = getFunctionNameMap();
     final String lookup = ( null != map ) ? map.get(glFunctionName) : null;
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
index 910afcd22..9d7ad64f9 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
@@ -36,7 +36,6 @@
 
 package jogamp.opengl.egl;
 
-import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import java.util.Map;
 
@@ -507,14 +506,4 @@ public class EGLContext extends GLContextImpl {
     protected void copyImpl(final GLContext source, final int mask) throws GLException {
         throw new GLException("Not yet implemented");
     }
-
-    @Override
-    public final ByteBuffer glAllocateMemoryNV(final int size, final float readFrequency, final float writeFrequency, final float priority) {
-        throw new GLException("Should not call this");
-    }
-
-    @Override
-    public final void glFreeMemoryNV(final ByteBuffer pointer) {
-        throw new GLException("Should not call this");
-    }
 }
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
index 51b243f37..3c22e612f 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
@@ -40,7 +40,6 @@
 
 package jogamp.opengl.macosx.cgl;
 
-import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import java.util.Map;
 
@@ -422,18 +421,6 @@ public class MacOSXCGLContext extends GLContextImpl
   }
 
   @Override
-  public final ByteBuffer glAllocateMemoryNV(final int size, final float readFrequency, final float writeFrequency, final float priority) {
-    // FIXME: apparently the Apple extension doesn't require a custom memory allocator
-    throw new GLException("Not yet implemented");
-  }
-
-  @Override
-  public final void glFreeMemoryNV(final ByteBuffer pointer) {
-    // FIXME: apparently the Apple extension doesn't require a custom memory allocator
-    throw new GLException("Not yet implemented");
-  }
-
-  @Override
   protected final void updateGLXProcAddressTable() {
     final AbstractGraphicsConfiguration aconfig = drawable.getNativeSurface().getGraphicsConfiguration();
     final AbstractGraphicsDevice adevice = aconfig.getScreen().getDevice();
diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java
index ec4575a9c..966a4dcf5 100644
--- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java
@@ -40,7 +40,6 @@
 
 package jogamp.opengl.windows.wgl;
 
-import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import java.util.HashMap;
 import java.util.Map;
@@ -63,7 +62,6 @@ import jogamp.opengl.GLContextImpl;
 import jogamp.opengl.GLDrawableImpl;
 
 public class WindowsWGLContext extends GLContextImpl {
-  static final Map<String, String> functionNameMap;
   static final Map<String, String> extensionNameMap;
   private boolean wglGetExtensionsStringEXTInitialized;
   private boolean wglGetExtensionsStringEXTAvailable;
@@ -77,10 +75,6 @@ public class WindowsWGLContext extends GLContextImpl {
   private int hasSwapGroupNV = 0;
 
   static {
-    functionNameMap = new HashMap<String, String>();
-    functionNameMap.put("glAllocateMemoryNV", "wglAllocateMemoryNV");
-    functionNameMap.put("glFreeMemoryNV", "wglFreeMemoryNV");
-
     extensionNameMap = new HashMap<String, String>();
     extensionNameMap.put(GLExtensions.ARB_pbuffer, WindowsWGLDrawableFactory.WGL_ARB_pbuffer);
     extensionNameMap.put(GLExtensions.ARB_pixel_format, WindowsWGLDrawableFactory.WGL_ARB_pixel_format);
@@ -192,7 +186,7 @@ public class WindowsWGLContext extends GLContextImpl {
   }
 
   @Override
-  protected Map<String, String> getFunctionNameMap() { return functionNameMap; }
+  protected Map<String, String> getFunctionNameMap() { return null; }
 
   @Override
   protected Map<String, String> getExtensionNameMap() { return extensionNameMap; }
@@ -572,15 +566,4 @@ public class WindowsWGLContext extends GLContextImpl {
       }
       return res;
   }
-
-  @Override
-  public final ByteBuffer glAllocateMemoryNV(final int size, final float readFrequency, final float writeFrequency, final float priority) {
-    return getWGLExt().wglAllocateMemoryNV(size, readFrequency, writeFrequency, priority);
-  }
-
-  @Override
-  public final void glFreeMemoryNV(final ByteBuffer pointer) {
-    getWGLExt().wglFreeMemoryNV(pointer);
-  }
-
 }
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
index 19056a73b..4665dc17c 100644
--- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
@@ -40,7 +40,6 @@
 
 package jogamp.opengl.x11.glx;
 
-import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import java.util.HashMap;
 import java.util.Map;
@@ -68,7 +67,6 @@ import com.jogamp.nativewindow.x11.X11GraphicsDevice;
 import com.jogamp.opengl.GLExtensions;
 
 public class X11GLXContext extends GLContextImpl {
-  private static final Map<String, String> functionNameMap;
   private static final Map<String, String> extensionNameMap;
   private GLXExt _glXExt;
   // Table that holds the addresses of the native C-language entry points for
@@ -86,10 +84,6 @@ public class X11GLXContext extends GLContextImpl {
   protected volatile boolean isGLXVersionGreaterEqualOneThree;
 
   static {
-    functionNameMap = new HashMap<String, String>();
-    functionNameMap.put("glAllocateMemoryNV", "glXAllocateMemoryNV");
-    functionNameMap.put("glFreeMemoryNV", "glXFreeMemoryNV");
-
     extensionNameMap = new HashMap<String, String>();
     extensionNameMap.put(GLExtensions.ARB_pbuffer,      X11GLXDrawableFactory.GLX_SGIX_pbuffer);
     extensionNameMap.put(GLExtensions.ARB_pixel_format, X11GLXDrawableFactory.GLX_SGIX_pbuffer); // good enough
@@ -134,7 +128,7 @@ public class X11GLXContext extends GLContextImpl {
   }
 
   @Override
-  protected Map<String, String> getFunctionNameMap() { return functionNameMap; }
+  protected Map<String, String> getFunctionNameMap() { return null; }
 
   @Override
   protected Map<String, String> getExtensionNameMap() { return extensionNameMap; }
@@ -647,16 +641,6 @@ public class X11GLXContext extends GLContextImpl {
   }
 
   @Override
-  public final ByteBuffer glAllocateMemoryNV(final int size, final float readFrequency, final float writeFrequency, final float priority) {
-    return getGLXExt().glXAllocateMemoryNV(size, readFrequency, writeFrequency, priority);
-  }
-
-  @Override
-  public final void glFreeMemoryNV(final ByteBuffer pointer) {
-    getGLXExt().glXFreeMemoryNV(pointer);
-  }
-
-  @Override
   public String toString() {
     final StringBuilder sb = new StringBuilder();
     sb.append(getClass().getSimpleName());