diff options
| author | Sven Gothel <[email protected]> | 2015-03-06 09:45:48 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-06 09:45:48 +0100 |
| commit | 0d59bd4c655ef9a27f127000848aae7f07f240ae (patch) | |
| tree | 3ac18e10e105ad70227bbb2205294ac3e6462c0e /make/config/jogl/gl-gl4bc.cfg | |
| parent | 0674a3678d747335ad36f0f57e3bdc9c168f0dcf (diff) | |
Bug 1135 - Change all GlueGen config files, supporting EGL 1.5 , ES 3.1 and GL 4.5
Diffstat (limited to 'make/config/jogl/gl-gl4bc.cfg')
| -rw-r--r-- | make/config/jogl/gl-gl4bc.cfg | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg index 668fc3427..034faa59e 100644 --- a/make/config/jogl/gl-gl4bc.cfg +++ b/make/config/jogl/gl-gl4bc.cfg @@ -2,6 +2,16 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/gl4 +# Inform the glue code generator of the association between #defines +# and functions and the extensions in which they are defined +# _for_ code generation. This shall match the parsed header files! +GLSemHeader GL/glext-supplement.h +GLSemHeader GL/gl.h +GLSemHeader GL/glext-20130207.h +GLSemHeader GL/glext.h +GLSemHeader GL/glcorearb.h +GLSemHeader GL/glcorearbext.h + ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES1.java ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java @@ -51,6 +61,7 @@ Implements GL4bcImpl GL4 Include gl-common.cfg Include gl-common-extensions.cfg Include gl-desktop.cfg +Include gl-embedded-ignores.cfg Include gl3-desktop.cfg Include gl3-common.cfg Include gl2_es2-CustomJavaCode.cfg @@ -135,27 +146,26 @@ JavaPrologue glPixelStorei glStateTracker.setInt(pname, param); JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; } JavaPrologue glFrustumf if ( !_context.hasFP32CompatAPI() ) { -JavaPrologue glFrustumf glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); +JavaPrologue glFrustumf glFrustum((double)l, (double)r, (double)b, (double)t, (double)n, (double)f); JavaPrologue glFrustumf return; JavaPrologue glFrustumf } JavaPrologue glOrthof if ( !_context.hasFP32CompatAPI() ) { -JavaPrologue glOrthof glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); +JavaPrologue glOrthof glOrtho((double)l, (double)r, (double)b, (double)t, (double)n, (double)f); JavaPrologue glOrthof return; JavaPrologue glOrthof } JavaPrologue glDepthRangef if ( !_context.isGLES2Compatible() && !_context.hasFP32CompatAPI() ) { -JavaPrologue glDepthRangef glDepthRange( (double)zNear, (double)zFar ); +JavaPrologue glDepthRangef glDepthRange( (double)n, (double)f ); JavaPrologue glDepthRangef return; JavaPrologue glDepthRangef } JavaPrologue glClearDepthf if ( !_context.isGLES2Compatible() && !_context.hasFP32CompatAPI() ) { -JavaPrologue glClearDepthf glClearDepth( (double)depth ); +JavaPrologue glClearDepthf glClearDepth( (double)d ); JavaPrologue glClearDepthf return; JavaPrologue glClearDepthf } Include gl-headers.cfg -Include gl3ext-headers.cfg IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-common.java IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-gl4bc.java |