From 360b6716f68b44b28fd8c4f8e61ab86d5a56738b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 9 Feb 2011 02:50:09 +0100 Subject: Move implementation private files from com.jogamp..impl. to jogamp. (2/2) - edit files - com.jogamp.opengl.impl -> jogamp.opengl - com.jogamp.opengl.util.glsl.fixedfunc.impl -> jogamp.opengl.util.glsl.fixedfunc - com.jogamp.nativewindow.impl -> jogamp.nativewindow - com.jogamp.newt.impl -> jogamp.newt This sorts implementation details from the top level, ie skipping the public 'com', allowing a better seperation of public classes and implementation details and also reduces strings. This approach of public/private seperation is also used in the OpenJDK. --- make/config/jogl/cg-common.cfg | 2 +- make/config/jogl/cgl-macosx.cfg | 2 +- make/config/jogl/cglext.cfg | 4 ++-- make/config/jogl/egl-common.cfg | 2 +- make/config/jogl/egl.cfg | 2 +- make/config/jogl/eglext.cfg | 6 +++--- make/config/jogl/gl-common.cfg | 2 +- make/config/jogl/gl-es1.cfg | 2 +- make/config/jogl/gl-es2.cfg | 2 +- make/config/jogl/gl-gl4bc.cfg | 2 +- make/config/jogl/gl-if-gl3.cfg | 2 +- make/config/jogl/gl-impl-CustomCCode-gl4bc.c | 12 ++++++------ make/config/jogl/gl-impl-CustomCCode-gles1.c | 8 ++++---- make/config/jogl/gl-impl-CustomCCode-gles2.c | 8 ++++---- make/config/jogl/glu-CustomJavaCode-base.java | 4 ++-- make/config/jogl/glu-CustomJavaCode-gl2es1.java | 2 +- make/config/jogl/glu-base.cfg | 4 ++-- make/config/jogl/glu-common.cfg | 6 +++--- make/config/jogl/glu-gl2.cfg | 12 ++++++------ make/config/jogl/glu-gl2es1.cfg | 2 +- make/config/jogl/glx-CustomCCode.c | 22 +++++++++++----------- make/config/jogl/glx-x11.cfg | 4 ++-- make/config/jogl/glxext.cfg | 8 ++++---- make/config/jogl/wgl-win32.cfg | 2 +- make/config/jogl/wglext.cfg | 4 ++-- 25 files changed, 63 insertions(+), 63 deletions(-) (limited to 'make/config/jogl') diff --git a/make/config/jogl/cg-common.cfg b/make/config/jogl/cg-common.cfg index 45bba955b..7ec47390f 100644 --- a/make/config/jogl/cg-common.cfg +++ b/make/config/jogl/cg-common.cfg @@ -101,7 +101,7 @@ Ignore cgGetParameterValues Ignore cgGetProgramOptions # And NativeLibLoader for help loading the native libraries -Import com.jogamp.opengl.impl.* +Import jogamp.opengl.* Import com.jogamp.common.os.DynamicLookupHelper Import com.jogamp.common.os.DynamicLibraryBundle Import com.jogamp.opengl.cg.CgDynamicLibraryBundleInfo diff --git a/make/config/jogl/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg index 2b28d3c68..38034a7ad 100644 --- a/make/config/jogl/cgl-macosx.cfg +++ b/make/config/jogl/cgl-macosx.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/MacOSX -Package com.jogamp.opengl.impl.macosx.cgl +Package jogamp.opengl.macosx.cgl JavaClass CGL Style AllStatic Include gl-common.cfg diff --git a/make/config/jogl/cglext.cfg b/make/config/jogl/cglext.cfg index 404a852b0..721fe911b 100644 --- a/make/config/jogl/cglext.cfg +++ b/make/config/jogl/cglext.cfg @@ -6,10 +6,10 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/MacOSX -Package com.jogamp.opengl.impl.macosx.cgl +Package jogamp.opengl.macosx.cgl Style InterfaceAndImpl JavaClass CGLExt -ImplPackage com.jogamp.opengl.impl.macosx.cgl +ImplPackage jogamp.opengl.macosx.cgl ImplJavaClass CGLExtImpl Include gl-common.cfg Include gl-desktop.cfg diff --git a/make/config/jogl/egl-common.cfg b/make/config/jogl/egl-common.cfg index fd65d5c10..da0e3320a 100644 --- a/make/config/jogl/egl-common.cfg +++ b/make/config/jogl/egl-common.cfg @@ -7,7 +7,7 @@ GLHeader EGL/eglext.h Import java.util.* Import javax.media.opengl.* Import javax.media.opengl.fixedfunc.* -Import com.jogamp.opengl.impl.* +Import jogamp.opengl.* # Treat all of the EGL types as opaque longs # Opaque long EGLConfig diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg index c194de2d0..ea299bfcc 100644 --- a/make/config/jogl/egl.cfg +++ b/make/config/jogl/egl.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/egl -Package com.jogamp.opengl.impl.egl +Package jogamp.opengl.egl JavaClass EGL Style AllStatic # Shouldn't matter which one of these we pick up diff --git a/make/config/jogl/eglext.cfg b/make/config/jogl/eglext.cfg index 3b46aca57..3af90d3af 100644 --- a/make/config/jogl/eglext.cfg +++ b/make/config/jogl/eglext.cfg @@ -3,15 +3,15 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/egl -Package com.jogamp.opengl.impl.egl +Package jogamp.opengl.egl Style InterfaceAndImpl JavaClass EGLExt -ImplPackage com.jogamp.opengl.impl.egl +ImplPackage jogamp.opengl.egl ImplJavaClass EGLExtImpl # Shouldn't matter which one of these we pick up Include egl-common.cfg -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/impl/egl/EGL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/jogamp/opengl/egl/EGL.java HierarchicalNativeOutput false diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index f74976d90..2c59a74ed 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -11,7 +11,7 @@ UnsupportedExceptionType GLException Import java.util.* Import javax.media.opengl.* Import javax.media.opengl.fixedfunc.* -Import com.jogamp.opengl.impl.* +Import jogamp.opengl.* ##################################################################### # Mostly desktop OpenGL stuff below diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index 4543b7fd2..5c69be9b7 100644 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -17,7 +17,7 @@ JavaClass GLES1 Extends GLES1 GLBase Extends GLES1 GL Extends GLES1 GL2ES1 -ImplPackage com.jogamp.opengl.impl.es1 +ImplPackage jogamp.opengl.es1 ImplJavaClass GLES1Impl Implements GLES1Impl GLBase Implements GLES1Impl GL diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg index 9caa3b7f7..dcdc39b29 100644 --- a/make/config/jogl/gl-es2.cfg +++ b/make/config/jogl/gl-es2.cfg @@ -12,7 +12,7 @@ JavaClass GLES2 Extends GLES2 GLBase Extends GLES2 GL Extends GLES2 GL2ES2 -ImplPackage com.jogamp.opengl.impl.es2 +ImplPackage jogamp.opengl.es2 ImplJavaClass GLES2Impl Implements GLES2Impl GLBase Implements GLES2Impl GL diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg index 33105d5f0..06a9c76f1 100644 --- a/make/config/jogl/gl-gl4bc.cfg +++ b/make/config/jogl/gl-gl4bc.cfg @@ -27,7 +27,7 @@ Extends GL4bc GL2 Extends GL4bc GL3 Extends GL4bc GL3bc Extends GL4bc GL4 -ImplPackage com.jogamp.opengl.impl.gl4 +ImplPackage jogamp.opengl.gl4 ImplJavaClass GL4bcImpl Implements GL4bcImpl GLBase Implements GL4bcImpl GL diff --git a/make/config/jogl/gl-if-gl3.cfg b/make/config/jogl/gl-if-gl3.cfg index 6682e4145..3ccc2c58c 100644 --- a/make/config/jogl/gl-if-gl3.cfg +++ b/make/config/jogl/gl-if-gl3.cfg @@ -14,7 +14,7 @@ Extends GL3 GLBase Extends GL3 GL Extends GL3 GL2ES2 Extends GL3 GL2GL3 -ImplPackage com.jogamp.opengl.impl.gl3 +ImplPackage jogamp.opengl.gl3 ImplJavaClass GL3Impl Implements GL3Impl GLBase Implements GL3Impl GL diff --git a/make/config/jogl/gl-impl-CustomCCode-gl4bc.c b/make/config/jogl/gl-impl-CustomCCode-gl4bc.c index 778559eba..d389db298 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gl4bc.c +++ b/make/config/jogl/gl-impl-CustomCCode-gl4bc.c @@ -1,10 +1,10 @@ /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.gl4.GL4bcImpl + * Java package: jogamp.opengl.gl4.GL4bcImpl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_jogamp_opengl_gl4_GL4bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -14,12 +14,12 @@ Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_dispatch_1glMapBuffer(JNIEnv *env, job } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.gl4.GL4bcImpl + * Java package: jogamp.opengl.gl4.GL4bcImpl * Java method: long dispatch_glMapNamedBufferEXT(int target, int access) * C function: void * glMapNamedBufferEXT(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_dispatch_1glMapNamedBufferEXT(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_jogamp_opengl_gl4_GL4bcImpl_dispatch_1glMapNamedBufferEXT(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPNAMEDBUFFEREXTPROC ptr_glMapNamedBufferEXT; void * _res; ptr_glMapNamedBufferEXT = (PFNGLMAPNAMEDBUFFEREXTPROC) (intptr_t) glProcAddress; @@ -29,11 +29,11 @@ Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_dispatch_1glMapNamedBufferEXT(JNIEnv * } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.gl4.GL4bcImpl + * Java package: jogamp.opengl.gl4.GL4bcImpl * Java method: ByteBuffer newDirectByteBuffer(long addr, long capacity); * C function: jobject newDirectByteBuffer(jlong addr, jlong capacity); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { +Java_jogamp_opengl_gl4_GL4bcImpl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/gl-impl-CustomCCode-gles1.c b/make/config/jogl/gl-impl-CustomCCode-gles1.c index 422935ba7..0155c13f8 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gles1.c +++ b/make/config/jogl/gl-impl-CustomCCode-gles1.c @@ -1,11 +1,11 @@ typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.es1.GLES1Impl + * Java package: jogamp.opengl.es1.GLES1Impl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_jogamp_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_jogamp_opengl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -15,11 +15,11 @@ Java_com_jogamp_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, job } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.es1.GLES1Impl + * Java package: jogamp.opengl.es1.GLES1Impl * Java method: ByteBuffer newDirectByteBuffer(long addr, long capacity); * C function: jobject newDirectByteBuffer(jlong addr, jlong capacity); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_es1_GLES1Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { +Java_jogamp_opengl_es1_GLES1Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/gl-impl-CustomCCode-gles2.c b/make/config/jogl/gl-impl-CustomCCode-gles2.c index 86fc47b4b..e140df76b 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gles2.c +++ b/make/config/jogl/gl-impl-CustomCCode-gles2.c @@ -1,11 +1,11 @@ typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.es2.GLES2Impl + * Java package: jogamp.opengl.es2.GLES2Impl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_jogamp_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_jogamp_opengl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -15,11 +15,11 @@ Java_com_jogamp_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, job } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.es2.GLES2Impl + * Java package: jogamp.opengl.es2.GLES2Impl * Java method: ByteBuffer newDirectByteBuffer(long addr, long capacity); * C function: jobject newDirectByteBuffer(jlong addr, jlong capacity); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_es2_GLES2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { +Java_jogamp_opengl_es2_GLES2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java index fcbcaca24..49722b469 100644 --- a/make/config/jogl/glu-CustomJavaCode-base.java +++ b/make/config/jogl/glu-CustomJavaCode-base.java @@ -169,7 +169,7 @@ protected static boolean checkedGLUtessellatorImpl = false; protected static final void validateGLUtessellatorImpl() { if(!checkedGLUtessellatorImpl) { - availableGLUtessellatorImpl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl", GLU.class.getClassLoader()); + availableGLUtessellatorImpl = ReflectionUtil.isClassAvailable("jogamp.opengl.glu.tessellator.GLUtessellatorImpl", GLU.class.getClassLoader()); checkedGLUtessellatorImpl = true; } if(!availableGLUtessellatorImpl) { @@ -1220,7 +1220,7 @@ protected static final void validateGLUquadricImpl() { if(!checkedGLUquadricImpl) { synchronized (syncObject) { if(!checkedGLUquadricImpl) { - availableGLUquadricImpl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.GLUquadricImpl", GLU.class.getClassLoader()); + availableGLUquadricImpl = ReflectionUtil.isClassAvailable("jogamp.opengl.glu.GLUquadricImpl", GLU.class.getClassLoader()); checkedGLUquadricImpl = true; } } diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java index 3f520498b..203d1eeae 100644 --- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java +++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java @@ -86,7 +86,7 @@ protected static boolean checkedMipmap = false; protected static final void validateMipmap() { if(!checkedMipmap) { - availableMipmap = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.mipmap.Mipmap", GLU.class.getClassLoader()); + availableMipmap = ReflectionUtil.isClassAvailable("jogamp.opengl.glu.mipmap.Mipmap", GLU.class.getClassLoader()); checkedMipmap = true; } if(!availableMipmap) { diff --git a/make/config/jogl/glu-base.cfg b/make/config/jogl/glu-base.cfg index d859225ec..f4021d6d8 100644 --- a/make/config/jogl/glu-base.cfg +++ b/make/config/jogl/glu-base.cfg @@ -20,8 +20,8 @@ Ignore gluScaleImage IncludeAs CustomJavaCode GLU glu-CustomJavaCode-base.java # Imports for the Error and Registry classes -Import com.jogamp.opengl.impl.glu.error.Error -Import com.jogamp.opengl.impl.glu.registry.Registry +Import jogamp.opengl.glu.error.Error +Import jogamp.opengl.glu.registry.Registry Include glu-common.cfg diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg index f5fc7c1b3..d2a480254 100644 --- a/make/config/jogl/glu-common.cfg +++ b/make/config/jogl/glu-common.cfg @@ -11,9 +11,9 @@ TagNativeBinding true # Import javax.media.opengl.* Import javax.media.opengl.glu.* -Import com.jogamp.opengl.impl.* -Import com.jogamp.opengl.impl.glu.* -Import com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl +Import jogamp.opengl.* +Import jogamp.opengl.glu.* +Import jogamp.opengl.glu.tessellator.GLUtessellatorImpl Import com.jogamp.common.util.ReflectionUtil # Raise GLException instead of RuntimeException in glue code diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg index aec0c446a..11eeb7c50 100644 --- a/make/config/jogl/glu-gl2.cfg +++ b/make/config/jogl/glu-gl2.cfg @@ -25,7 +25,7 @@ CustomCCode #endif Include ../intptr.cfg EmitProcAddressTable true -ProcAddressTablePackage com.jogamp.opengl.impl.glu.gl2 +ProcAddressTablePackage jogamp.opengl.glu.gl2 ProcAddressTableClassName GLUgl2ProcAddressTable GetProcAddressTableExpr getGLUProcAddressTable() @@ -38,14 +38,14 @@ IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java # GLU needs access to the GLUtesselatorImpl class for GLUtesselator, # to the Mipmap class for scaling and mipmap generation, # and to the nurbs.* package for the NURBS functionality -Import com.jogamp.opengl.impl.glu.nurbs.* +Import jogamp.opengl.glu.nurbs.* Import java.security.* Import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver -Import com.jogamp.opengl.impl.glu.gl2.nurbs.* -Import com.jogamp.opengl.impl.glu.mipmap.Mipmap -Import com.jogamp.opengl.impl.glu.gl2.* +Import jogamp.opengl.glu.gl2.nurbs.* +Import jogamp.opengl.glu.mipmap.Mipmap +Import jogamp.opengl.glu.gl2.* Import javax.media.opengl.GL2 -Import com.jogamp.opengl.impl.gl2.ProjectDouble +Import jogamp.opengl.gl2.ProjectDouble # # ------------------------ diff --git a/make/config/jogl/glu-gl2es1.cfg b/make/config/jogl/glu-gl2es1.cfg index af89014f4..fa7011360 100644 --- a/make/config/jogl/glu-gl2es1.cfg +++ b/make/config/jogl/glu-gl2es1.cfg @@ -20,7 +20,7 @@ Ignore gluScaleImage IncludeAs CustomJavaCode GLUgl2es1 glu-CustomJavaCode-gl2es1.java Import javax.media.opengl.GLES1 -Import com.jogamp.opengl.impl.glu.mipmap.Mipmap +Import jogamp.opengl.glu.mipmap.Mipmap Include glu-common.cfg diff --git a/make/config/jogl/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c index dec3f4583..e372e5120 100644 --- a/make/config/jogl/glx-CustomCCode.c +++ b/make/config/jogl/glx-CustomCCode.c @@ -30,29 +30,29 @@ static void _initClazzAccess(JNIEnv *env) { c = (*env)->FindClass(env, clazzNameBuffers); if(NULL==c) { - fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameBuffers); + fprintf(stderr, "FatalError: Java_jogamp_opengl_x11_glx_GLX: can't find %s\n", clazzNameBuffers); (*env)->FatalError(env, clazzNameBuffers); } clazzBuffers = (jclass)(*env)->NewGlobalRef(env, c); if(NULL==clazzBuffers) { - fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameBuffers); + fprintf(stderr, "FatalError: Java_jogamp_opengl_x11_glx_GLX: can't use %s\n", clazzNameBuffers); (*env)->FatalError(env, clazzNameBuffers); } c = (*env)->FindClass(env, clazzNameByteBuffer); if(NULL==c) { - fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameByteBuffer); + fprintf(stderr, "FatalError: Java_jogamp_opengl_x11_glx_GLX: can't find %s\n", clazzNameByteBuffer); (*env)->FatalError(env, clazzNameByteBuffer); } clazzByteBuffer = (jclass)(*env)->NewGlobalRef(env, c); if(NULL==c) { - fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameByteBuffer); + fprintf(stderr, "FatalError: Java_jogamp_opengl_x11_glx_GLX: can't use %s\n", clazzNameByteBuffer); (*env)->FatalError(env, clazzNameByteBuffer); } cstrBuffers = (*env)->GetStaticMethodID(env, clazzBuffers, clazzNameBuffersStaticCstrName, clazzNameBuffersStaticCstrSignature); if(NULL==cstrBuffers) { - fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX:: can't create %s.%s %s\n", + fprintf(stderr, "FatalError: Java_jogamp_opengl_x11_glx_GLX:: can't create %s.%s %s\n", clazzNameBuffers, clazzNameBuffersStaticCstrName, clazzNameBuffersStaticCstrSignature); (*env)->FatalError(env, clazzNameBuffersStaticCstrName); @@ -60,12 +60,12 @@ static void _initClazzAccess(JNIEnv *env) { } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.x11.glx.GLX + * Java package: jogamp.opengl.x11.glx.GLX * Java method: XVisualInfo glXGetVisualFromFBConfig(long dpy, long config) * C function: XVisualInfo * glXGetVisualFromFBConfig(Display * dpy, GLXFBConfig config); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_x11_glx_GLX_dispatch_1glXGetVisualFromFBConfig(JNIEnv *env, jclass _unused, jlong dpy, jlong config, jlong procAddress) { +Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetVisualFromFBConfig(JNIEnv *env, jclass _unused, jlong dpy, jlong config, jlong procAddress) { typedef XVisualInfo* (APIENTRY*_local_PFNGLXGETVISUALFROMFBCONFIG)(Display * dpy, GLXFBConfig config); _local_PFNGLXGETVISUALFROMFBCONFIG ptr_glXGetVisualFromFBConfig; XVisualInfo * _res; @@ -88,12 +88,12 @@ Java_com_jogamp_opengl_impl_x11_glx_GLX_dispatch_1glXGetVisualFromFBConfig(JNIEn } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.x11.glx.GLX + * Java package: jogamp.opengl.x11.glx.GLX * Java method: java.nio.LongBuffer glXChooseFBConfig(long dpy, int screen, java.nio.IntBuffer attribList, java.nio.IntBuffer nitems) * C function: GLXFBConfig * glXChooseFBConfig(Display * dpy, int screen, const int * attribList, int * nitems); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset, jlong procAddress) { +Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset, jlong procAddress) { typedef GLXFBConfig* (APIENTRY*_local_PFNGLXCHOOSEFBCONFIG)(Display * dpy, int screen, const int * attribList, int * nitems); _local_PFNGLXCHOOSEFBCONFIG ptr_glXChooseFBConfig; int * _ptr2 = NULL; @@ -131,12 +131,12 @@ Java_com_jogamp_opengl_impl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.x11.glx.GLX + * Java package: jogamp.opengl.x11.glx.GLX * Java method: XVisualInfo glXChooseVisual(long dpy, int screen, java.nio.IntBuffer attribList) * C function: XVisualInfo * glXChooseVisual(Display * dpy, int screen, int * attribList); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_x11_glx_GLX_dispatch_1glXChooseVisual(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jlong procAddress) { +Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseVisual(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jlong procAddress) { typedef XVisualInfo* (APIENTRY*_local_PFNGLXCHOOSEVISUAL)(Display * dpy, int screen, int * attribList); _local_PFNGLXCHOOSEVISUAL ptr_glXChooseVisual; int * _ptr2 = NULL; diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg index dee1d015f..4daa78b84 100644 --- a/make/config/jogl/glx-x11.cfg +++ b/make/config/jogl/glx-x11.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/X11 -Package com.jogamp.opengl.impl.x11.glx +Package jogamp.opengl.x11.glx JavaClass GLX Style AllStatic Include gl-common.cfg @@ -21,7 +21,7 @@ EmitProcAddressTable true ProcAddressTableClassName GLXProcAddressTable GetProcAddressTableExpr glxProcAddressTable -Import com.jogamp.nativewindow.impl.x11.* +Import jogamp.nativewindow.x11.* Import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver CustomJavaCode GLX private static GLXProcAddressTable glxProcAddressTable = new GLXProcAddressTable(new GLProcAddressResolver()); diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg index aeed3af4e..82490a2e8 100644 --- a/make/config/jogl/glxext.cfg +++ b/make/config/jogl/glxext.cfg @@ -3,13 +3,13 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/X11 -Package com.jogamp.opengl.impl.x11.glx +Package jogamp.opengl.x11.glx Style InterfaceAndImpl JavaClass GLXExt -ImplPackage com.jogamp.opengl.impl.x11.glx +ImplPackage jogamp.opengl.x11.glx ImplJavaClass GLXExtImpl -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/impl/x11/glx/GLX.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/jogamp/opengl/x11/glx/GLX.java Include gl-common.cfg Include gl-desktop.cfg @@ -20,7 +20,7 @@ EmitProcAddressTable true ProcAddressTableClassName GLXExtProcAddressTable GetProcAddressTableExpr _context.getGLXExtProcAddressTable() -Import com.jogamp.nativewindow.impl.x11.* +Import jogamp.nativewindow.x11.* # Ignore everything that doesn't start with glX or GLX IgnoreNot ^(glX|GLX).+ diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg index 97938a853..a86834531 100644 --- a/make/config/jogl/wgl-win32.cfg +++ b/make/config/jogl/wgl-win32.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/Windows -Package com.jogamp.opengl.impl.windows.wgl +Package jogamp.opengl.windows.wgl JavaClass WGL Style AllStatic Include gl-common.cfg diff --git a/make/config/jogl/wglext.cfg b/make/config/jogl/wglext.cfg index aca757b1c..d37a861b7 100644 --- a/make/config/jogl/wglext.cfg +++ b/make/config/jogl/wglext.cfg @@ -3,10 +3,10 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/Windows -Package com.jogamp.opengl.impl.windows.wgl +Package jogamp.opengl.windows.wgl Style InterfaceAndImpl JavaClass WGLExt -ImplPackage com.jogamp.opengl.impl.windows.wgl +ImplPackage jogamp.opengl.windows.wgl ImplJavaClass WGLExtImpl Include gl-common.cfg Include gl-desktop.cfg -- cgit v1.2.3