diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 22 | ||||
| -rwxr-xr-x | make/egl.cfg | 2 | ||||
| -rw-r--r-- | make/gl-common.cfg | 32 | ||||
| -rwxr-xr-x | make/gl-if-gl2_es2.cfg | 1 | ||||
| -rwxr-xr-x | make/glxext.cfg | 2 |
5 files changed, 22 insertions, 37 deletions
diff --git a/make/build.xml b/make/build.xml index b6c120caf..0dddeb43c 100644 --- a/make/build.xml +++ b/make/build.xml @@ -491,6 +491,7 @@ <target name="declare.gl.gles" unless="jogl.noes" depends="declare.gl.gles1, declare.gl.gles2"> <!-- Prepare to build the EGL interface --> <property name="window.es.cfg" value="${config}/egl.cfg" /> + <property name="window.es.ext.cfg" value="${config}/eglext.cfg" /> <property name="window.es.system" value="gluegen_egl"/> </target> @@ -745,6 +746,17 @@ </gluegen> </target> + <target name="java.generate.window.system.es.ext" if="window.es.ext.cfg" unless="jogl.noes"> + <echo message="Generating EGLExt implementation class" /> + <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.es.system}/**" /> + <gluegen src="${stub.includes.dir}/${window.es.system}/window-system-ext.c" + config="${window.es.ext.cfg}" + includeRefid="stub.includes.fileset.platform" + emitter="com.sun.gluegen.opengl.GLEmitter"> + <classpath refid="gluegen.classpath" /> + </gluegen> + </target> + <target name="java.generate.window.system.os" if="window.os.cfg" unless="jogl.nogl2"> <echo message="Generating WGL/GLX/CGL/EGL implementation class" /> <gluegen src="${stub.includes.dir}/${window.os.system}/window-system.c" @@ -843,7 +855,8 @@ <antcall target="java.generate.gl.all" inheritRefs="true" /> <!--antcall target="java.generate.gl.nsig" inheritRefs="true" /--> - <antcall target="java.generate.window.system.es" inheritRefs="true" /> + <antcall target="java.generate.window.system.es" inheritRefs="true" /> + <antcall target="java.generate.window.system.es.ext" inheritRefs="true" /> <echo message="Generating platform-specifics: X11" /> <antcall target="java.generate.gl.platforms" inheritRefs="true"> @@ -876,13 +889,6 @@ <param name="jawt.platform.header" value="${stub.includes.dir}/jni/macosx/jawt_md.h" /> </antcall> - <echo message="Generating StaticGLInfo class" /> - <staticglgen package="com.sun.opengl.impl" - headers="${gl2.headers} ${gles1.headers} ${gles2.headers}" - outputdir="${src.generated.java}/com/sun/opengl/impl"> - <classpath refid="gluegen.classpath" /> - </staticglgen> - <!-- Generate GLU class --> <antcall target="java.generate.glu.base" inheritrefs="true" /> <antcall target="java.generate.glu.GL2ES1" inheritrefs="true" /> diff --git a/make/egl.cfg b/make/egl.cfg index 5e2e108fe..53dfd1603 100755 --- a/make/egl.cfg +++ b/make/egl.cfg @@ -38,12 +38,14 @@ ForceProcAddressGen __ALL__ # Treat all of the EGL types as opaque longs # Opaque long EGLConfig +Opaque long EGLConfig Opaque long EGLContext Opaque long EGLDisplay Opaque long EGLSurface Opaque long EGLNativeDisplayType Opaque long EGLNativeWindowType Opaque long EGLNativePixmapType +Opaque long EGLClientBuffer # Opaque long EGLClientBuffer diff --git a/make/gl-common.cfg b/make/gl-common.cfg index 7bba60ab0..1b857198b 100644 --- a/make/gl-common.cfg +++ b/make/gl-common.cfg @@ -509,36 +509,12 @@ CustomJavaCode GL * met if the function is either part of the core OpenGL ver CustomJavaCode GL * both the host and display, or it is an OpenGL extension function that both CustomJavaCode GL * the host and display support. <P> CustomJavaCode GL * -CustomJavaCode GL * A GL function is <i>callable</i> if it is statically linked, or can be -CustomJavaCode GL * dynamically linked at runtime. +CustomJavaCode GL * A GL function is <i>callable</i> if it is successfully linked at runtime, +CustomJavaCode GL * hence the GLContext must be made current at least once. CustomJavaCode GL * -CustomJavaCode GL * Whether or not a GL function is <i>available</i> is determined as follows: -CustomJavaCode GL * <ul> -CustomJavaCode GL * <li>If the function is an OpenGL core function (i.e., not an -CustomJavaCode GL * extension), <code>glGetString(GL_VERSION)</code> is used to determine the -CustomJavaCode GL * version number of the highest OpenGL specification version that both host -CustomJavaCode GL * and display support, and then the function name is cross-referenced -CustomJavaCode GL * with that specification version to see if it is part of that version. - -CustomJavaCode GL * <li> If the function is an OpenGL extension, the function name is -CustomJavaCode GL * cross-referenced with the list returned by -CustomJavaCode GL * <code>glGetString(GL_EXTENSIONS)</code> to see if the function is one of -CustomJavaCode GL * the extensions that is supported on both host and display. -CustomJavaCode GL * </ul> -CustomJavaCode GL * -CustomJavaCode GL * <b>NOTE:</b>The availability of a function may change at runtime in -CustomJavaCode GL * response to changes in the display environment. For example, when a window -CustomJavaCode GL * is dragged from one display to another on a multi-display system, or when -CustomJavaCode GL * the properties of the display device are modified (e.g., changing the color -CustomJavaCode GL * depth of the display). Any application that is concerned with handling -CustomJavaCode GL * these situations correctly should confirm availability after a display -CustomJavaCode GL * change before calling a questionable OpenGL function. To detect a change in -CustomJavaCode GL * the display device, please see {@link -CustomJavaCode GL * GLEventListener#displayChanged(GLAutoDrawable,boolean,boolean)}. -CustomJavaCode GL * CustomJavaCode GL * @param glFunctionName the name of the OpenGL function (e.g., use -CustomJavaCode GL * "glBindRenderbufferEXT" to check if {@link -CustomJavaCode GL * #glBindRenderbufferEXT(int,int)} is available). +CustomJavaCode GL * "glBindRenderbufferEXT" or "glBindRenderbuffer" to check if {@link +CustomJavaCode GL * #glBindRenderbuffer(int,int)} is available). CustomJavaCode GL */ CustomJavaCode GL public boolean isFunctionAvailable(String glFunctionName); diff --git a/make/gl-if-gl2_es2.cfg b/make/gl-if-gl2_es2.cfg index 1ad1ac8de..b8fa3f8c6 100755 --- a/make/gl-if-gl2_es2.cfg +++ b/make/gl-if-gl2_es2.cfg @@ -5,7 +5,6 @@ JavaClass GL2ES2 Extends GL2ES2 GL ExtendedInterfaceSymbols ../build/gensrc/classes/javax/media/opengl/GL.java - HierarchicalNativeOutput false Include gl-common.cfg Include gl-common-extensions.cfg diff --git a/make/glxext.cfg b/make/glxext.cfg index 1c93a063c..1e8b7bb44 100755 --- a/make/glxext.cfg +++ b/make/glxext.cfg @@ -8,6 +8,8 @@ Style InterfaceAndImpl JavaClass GLXExt ImplPackage com.sun.opengl.impl.x11.glx ImplJavaClass GLXExtImpl + +ExtendedInterfaceSymbols ../build/gensrc/classes/com/sun/opengl/impl/x11/glx/GLX.java Include gl-common-gl2.cfg Include gl-desktop.cfg |