Merged JSR-231 branch on to the main JOGL trunk. The main trunk now

contains the evolving JSR-231 Reference Implementation and the JSR-231
branch is permanently closed.


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

1 files changed, 4 insertions, 66 deletions

diff --git a/make/gl-impl-CustomCCode.c b/make/gl-impl-CustomCCode.c
index f0c7cb45a..2ea5376e7 100644
--- a/make/gl-impl-CustomCCode.c
+++ b/make/gl-impl-CustomCCode.c
@@ -1,10 +1,10 @@
 /*   Java->C glue code:
- *   Java package: net.java.games.jogl.impl.windows.WindowsGLImpl
+ *   Java package: net.java.games.jogl.impl.GLImpl
  *    Java method: long dispatch_glMapBuffer(int target, int access)
  *     C function: LPVOID glMapBuffer(GLenum target, GLenum access);
  */
 JNIEXPORT jlong JNICALL 
-Java_net_java_games_jogl_impl_windows_WindowsGLImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
   PFNGLMAPBUFFERPROC ptr_glMapBuffer;
   LPVOID _res;
   ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -14,12 +14,12 @@ Java_net_java_games_jogl_impl_windows_WindowsGLImpl_dispatch_1glMapBuffer(JNIEnv
 }
 
 /*   Java->C glue code:
- *   Java package: net.java.games.jogl.impl.windows.WindowsGLImpl
+ *   Java package: net.java.games.jogl.impl.GLImpl
  *    Java method: long dispatch_glMapBufferARB(int target, int access)
  *     C function: LPVOID glMapBufferARB(GLenum target, GLenum access);
  */
 JNIEXPORT jlong JNICALL 
-Java_net_java_games_jogl_impl_windows_WindowsGLImpl_dispatch_1glMapBufferARB(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_sun_opengl_impl_GLImpl_dispatch_1glMapBufferARB(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
   PFNGLMAPBUFFERARBPROC ptr_glMapBufferARB;
   LPVOID _res;
   ptr_glMapBufferARB = (PFNGLMAPBUFFERARBPROC) (intptr_t) glProcAddress;
@@ -27,65 +27,3 @@ Java_net_java_games_jogl_impl_windows_WindowsGLImpl_dispatch_1glMapBufferARB(JNI
   _res = (* ptr_glMapBufferARB) ((GLenum) target, (GLenum) access);
   return (jlong) (intptr_t) _res;
 }
-
-/*   Java->C glue code:
- *   Java package: net.java.games.jogl.impl.x11.X11GLImpl
- *    Java method: long dispatch_glMapBuffer(int target, int access)
- *     C function: LPVOID glMapBuffer(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL 
-Java_net_java_games_jogl_impl_x11_X11GLImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
-  PFNGLMAPBUFFERPROC ptr_glMapBuffer;
-  LPVOID _res;
-  ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
-  assert(ptr_glMapBuffer != NULL);
-  _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
-  return (jlong) (intptr_t) _res;
-}
-
-/*   Java->C glue code:
- *   Java package: net.java.games.jogl.impl.x11.X11GLImpl
- *    Java method: long dispatch_glMapBufferARB(int target, int access)
- *     C function: LPVOID glMapBufferARB(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL 
-Java_net_java_games_jogl_impl_x11_X11GLImpl_dispatch_1glMapBufferARB(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
-  PFNGLMAPBUFFERARBPROC ptr_glMapBufferARB;
-  LPVOID _res;
-  ptr_glMapBufferARB = (PFNGLMAPBUFFERARBPROC) (intptr_t) glProcAddress;
-  assert(ptr_glMapBufferARB != NULL);
-  _res = (* ptr_glMapBufferARB) ((GLenum) target, (GLenum) access);
-  return (jlong) (intptr_t) _res;
-}
-
-/*   Java->C glue code:
- *   Java package: net.java.games.jogl.impl.macosx.MacOSXGLImpl
- *    Java method: long dispatch_glMapBufferARB(int target, int access)
- *     C function: LPVOID glMapBufferARB(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL
-Java_net_java_games_jogl_impl_macosx_MacOSXGLImpl_dispatch_1glMapBuffer( JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress)
-{
-    PFNGLMAPBUFFERPROC ptr_glMapBuffer;
-    LPVOID _res;
-    ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
-    assert(ptr_glMapBuffer != NULL);
-    _res = (* ptr_glMapBuffer) ((GLenum) target, (GLenum) access);
-    return (jlong) (intptr_t) _res; 
-}
-
-/*   Java->C glue code:
- *   Java package: net.java.games.jogl.impl.macosx.MacOSXGLImpl
- *    Java method: long dispatch_glMapBuffer(int target, int access)
- *     C function: LPVOID glMapBuffer(GLenum target, GLenum access);
- */
-JNIEXPORT jlong JNICALL
-Java_net_java_games_jogl_impl_macosx_MacOSXGLImpl_dispatch_1glMapBufferARB(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress)
-{
-    PFNGLMAPBUFFERARBPROC ptr_glMapBufferARB;
-    LPVOID _res;
-    ptr_glMapBufferARB = (PFNGLMAPBUFFERARBPROC) (intptr_t) glProcAddress;
-    assert(ptr_glMapBufferARB != NULL);
-    _res = (* ptr_glMapBufferARB) ((GLenum) target, (GLenum) access);
-    return (jlong) (intptr_t) _res;
-}