Merge branch 'master' of ssh://[email protected]/jogl~jogl-git

1 files changed, 13 insertions, 9 deletions

diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
index 28edd7a63..7e9b786b0 100755
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
@@ -40,6 +40,10 @@ public final boolean isGL2ES2() {
     return true;
 }
 
+public final boolean isGL2GL3() {
+    return false;
+}
+
 public final boolean hasGLSL() {
     return true;
 }
@@ -72,6 +76,10 @@ public final GL2ES2 getGL2ES2() throws GLException {
     return this;
 }
 
+public final GL2GL3 getGL2GL3() throws GLException {
+    throw new GLException("Not a GL2GL3 implementation");
+}
+
 public boolean isFunctionAvailable(String glFunctionName) {
   return _context.isFunctionAvailable(glFunctionName);
 }
@@ -93,18 +101,14 @@ public GLContext getContext() {
 
 private GLContextImpl _context;
 
-/**
- * Provides platform-independent access to the wglAllocateMemoryNV /
- * glXAllocateMemoryNV extension.
- */
-public java.nio.ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
-  return _context.glAllocateMemoryNV(arg0, arg1, arg2, arg3);
-}
-
 public void setSwapInterval(int interval) {
   _context.setSwapInterval(interval);
 }
 
+public int getSwapInterval() {
+  return _context.getSwapInterval();
+}
+
 public Object getPlatformGLExtensions() {
   return _context.getPlatformGLExtensions();
 }
@@ -298,7 +302,7 @@ private Map/*<ARBVBOKey, ByteBuffer>*/ arbVBOCache = new HashMap();
 
 /** Entry point to C language function: <br> <code> LPVOID glMapBuffer(GLenum target, GLenum access); </code>    */
 public java.nio.ByteBuffer glMapBuffer(int target, int access) {
-  final long __addr_ = ((GLES2ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBufferOES;
+  final long __addr_ = ((GLES2ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
   if (__addr_ == 0) {
     throw new GLException("Method \"glMapBuffer\" not available");
   }