From ca119c97340caf325cd682c5fdbe8f794a35ac0e Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 24 Aug 2010 02:39:14 +0200 Subject: Add OpenGL 3.3, 4.0 and 4.1 language mapping. - Update header: - GL/glext.h to khronos 2010-08-03 - GL3/gl3.h to khronos 2010-08-03 - Move platform code to GL/glplatform.h GL3/glplatform.h - Unify 64bit typedefs: gl-64bit-types.h - Move GL 3.[123] and 4.[01] complete subsumed extension enums and functions into their extension spec and just reference them. This ensures proper extension availability via lower OpenGL profiles, hence a proper GL2GL3 interface. - GL3/GL4 cleanup: - make-glextension-depignore.sh: determine required GL version for extensions for proper positioning, ie GL2GL3 or GL3 or GL4 via gluegen IgnoreExtension commands. - use ARB_ES2_compatibility for common GL2ES2 methods, if available - consolidated gl2-gl4 subsumed extension to gl-common.cfg - Missing GL3/GL4 Functions: glMultiDrawElementsBaseVertex glDebugMessageCallbackARB glDebugMessageCallbackAMD - TODO (new feature integration): - ARB_ES2_compatibility / ARB_get_program_binary for com/jogamp/opengl/util/glsl, ie - store binaries com/jogamp/opengl/util/glsl/sdk/CompileShader* - query supported binary formats (enums ?) - optional prio binaries - ARB_ES2_compatibility, if available GLES2/GL2ES12 would be available - ARB_separate_shader_objects for com/jogamp/opengl/util/glsl, ie - swizzle vertex/fragment shader in programs - .. --- make/config/jogl/gl-gl4bc.cfg | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'make/config/jogl/gl-gl4bc.cfg') diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg index ccd9723e6..005b667ef 100644 --- a/make/config/jogl/gl-gl4bc.cfg +++ b/make/config/jogl/gl-gl4bc.cfg @@ -42,9 +42,8 @@ Implements GL4bcImpl GL4 Include gl-common.cfg Include gl-common-extensions.cfg Include gl-desktop.cfg -Include gl3-common.cfg -Include gl4-common.cfg Include gl3-desktop.cfg +Include gl2_es2-common.cfg # Manually implement glMapNamedBufferEXT as the size of the returned buffer # can only be computed by calling another routine @@ -84,12 +83,6 @@ CustomJavaCode GL4bcImpl glFrustum((double)left, (double)right, (double)bottom CustomJavaCode GL4bcImpl public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) { CustomJavaCode GL4bcImpl glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); } -CustomJavaCode GL4bcImpl public void glClearDepthf(float depth) { -CustomJavaCode GL4bcImpl glClearDepth((double)depth); } - -CustomJavaCode GL4bcImpl public void glDepthRangef(float zNear, float zFar) { -CustomJavaCode GL4bcImpl glDepthRange((double)zNear, (double)zFar); } - Include gl-headers.cfg Include gl3ext-headers.cfg Include ../intptr.cfg -- cgit v1.2.3