Add OpenGL 3.x compatibility profile GL3bc,

where 'bc' is not a religious remark,
but simply means 'backward compatible' :)

GL3bc := GL2 + GL3,
hence the interface does not define any new values or methods.

Moved GL3's 3.1 part from gl3.h to gl3ext.h,
so it can be included in gl3bc.c, besides gl2.h.

5 files changed, 50 insertions, 10 deletions

diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
index 587bb6738..cd1a24459 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
@@ -28,6 +28,10 @@ public final boolean isGL() {
     return true;
 }
   
+public final boolean isGL3bc() {
+    return false;
+}
+
 public final boolean isGL3() {
     return false;
 }
@@ -68,6 +72,10 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL3bc getGL3bc() throws GLException {
+    throw new GLException("Not a GL3bc implementation");
+}
+
 public final GL3 getGL3() throws GLException {
     throw new GLException("Not a GL3 implementation");
 }
@@ -147,7 +155,7 @@ public Object getPlatformGLExtensions() {
     based on code in the SGI OpenGL sample implementation. */
 
 private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             int dimensions, boolean pack) {
+                             boolean pack) {
   int elements = 0;
   int esize = 0;
   
@@ -230,7 +238,7 @@ private int imageSizeInBytes(int format, int type, int w, int h, int d,
   default:
     return 0;
   }
-  return imageSizeInBytes(elements * esize, w, h, d, dimensions, pack);
+  return imageSizeInBytes(elements * esize, w, h, d, pack);
 }
 
 private GLBufferSizeTracker  bufferSizeTracker;
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
index 8e9c8bf01..2eca2b6ab 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
@@ -30,6 +30,10 @@ public final boolean isGL() {
     return true;
 }
 
+public final boolean isGL3bc() {
+    return false;
+}
+
 public final boolean isGL3() {
     return false;
 }
@@ -70,6 +74,10 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL3bc getGL3bc() throws GLException {
+    throw new GLException("Not a GL3bc implementation");
+}
+
 public final GL3 getGL3() throws GLException {
     throw new GLException("Not a GL3 implementation");
 }
@@ -147,7 +155,7 @@ public Object getPlatformGLExtensions() {
     based on code in the SGI OpenGL sample implementation. */
 
 private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             int dimensions, boolean pack) {
+                             boolean pack) {
   int elements = 0;
   int esize = 0;
   
@@ -202,7 +210,7 @@ private int imageSizeInBytes(int format, int type, int w, int h, int d,
   default:
     return 0;
   }
-  return imageSizeInBytes(elements * esize, w, h, d, dimensions, pack);
+  return imageSizeInBytes(elements * esize, w, h, d, pack);
 }
 
 private GLBufferSizeTracker  bufferSizeTracker;
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl3.java b/make/config/jogl/gl-impl-CustomJavaCode-gl3.java
index b69188c73..16ff008cf 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl3.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl3.java
@@ -27,6 +27,10 @@ public final boolean isGL() {
     return true;
 }
   
+public final boolean isGL3bc() {
+    return false;
+}
+
 public final boolean isGL3() {
     return true;
 }
@@ -67,6 +71,10 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL3bc getGL3bc() throws GLException {
+    throw new GLException("Not a GL3bc implementation");
+}
+
 public final GL3 getGL3() throws GLException {
     return this;
 }
@@ -146,7 +154,7 @@ public Object getPlatformGLExtensions() {
     based on code in the SGI OpenGL sample implementation. */
 
 private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             int dimensions, boolean pack) {
+                             boolean pack) {
   int elements = 0;
   int esize = 0;
   
@@ -221,7 +229,7 @@ private int imageSizeInBytes(int format, int type, int w, int h, int d,
   default:
     return 0;
   }
-  return imageSizeInBytes(elements * esize, w, h, d, dimensions, pack);
+  return imageSizeInBytes(elements * esize, w, h, d, pack);
 }
 
 private GLBufferSizeTracker  bufferSizeTracker;
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index 4e46f076b..dfef10ec9 100755
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -10,6 +10,10 @@ public final boolean isGL() {
     return true;
 }
   
+public final boolean isGL3bc() {
+    return false;
+}
+
 public final boolean isGL3() {
     return false;
 }
@@ -50,6 +54,10 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL3bc getGL3bc() throws GLException {
+    throw new GLException("Not a GL3bc implementation");
+}
+
 public final GL3 getGL3() throws GLException {
     throw new GLException("Not a GL3 implementation");
 }
@@ -121,7 +129,7 @@ public Object getPlatformGLExtensions() {
     based on code in the SGI OpenGL sample implementation. */
 
 private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             int dimensions, boolean pack) {
+                             boolean pack) {
   int elements = 0;
   int esize = 0;
   
@@ -166,7 +174,7 @@ private int imageSizeInBytes(int format, int type, int w, int h, int d,
   default:
     return 0;
   }
-  return imageSizeInBytes(elements * esize, w, h, d, dimensions, pack);
+  return imageSizeInBytes(elements * esize, w, h, d, pack);
 }
 
 private GLBufferSizeTracker  bufferSizeTracker;
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
index 97a0dbd27..7287408a0 100755
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
@@ -14,6 +14,10 @@ public final boolean isGL() {
     return true;
 }
   
+public final boolean isGL3bc() {
+    return false;
+}
+
 public final boolean isGL3() {
     return false;
 }
@@ -54,6 +58,10 @@ public final GL getGL() throws GLException {
     return this;
 }
 
+public final GL3bc getGL3bc() throws GLException {
+    throw new GLException("Not a GL3bc implementation");
+}
+
 public final GL3 getGL3() throws GLException {
     throw new GLException("Not a GL3 implementation");
 }
@@ -125,7 +133,7 @@ public Object getPlatformGLExtensions() {
     based on code in the SGI OpenGL sample implementation. */
 
 private int imageSizeInBytes(int format, int type, int w, int h, int d,
-                             int dimensions, boolean pack) {
+                             boolean pack) {
   int elements = 0;
   int esize = 0;
   
@@ -176,7 +184,7 @@ private int imageSizeInBytes(int format, int type, int w, int h, int d,
   default:
     return 0;
   }
-  return imageSizeInBytes(elements * esize, w, h, d, dimensions, pack);
+  return imageSizeInBytes(elements * esize, w, h, d, pack);
 }
 
 private GLBufferSizeTracker  bufferSizeTracker;