summaryrefslogtreecommitdiffstats
path: root/make/config/jogl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-02-14 06:39:35 +0100
committerSven Gothel <[email protected]>2012-02-14 06:39:35 +0100
commit354af5b403220b0d94d2d73e067c80d87ec3fc6d (patch)
tree94d03a718b8a069642cb9b1e4d426a18de3d2548 /make/config/jogl
parent413026e5f9277dc9271543d76d3094c299322c70 (diff)
OpenGL 4.2 functional support (GL header sync)
Note: EXT_shader_image_load_store is dropped to favor ARB_shader_image_load_store Since no new (4.2) extension still does not require >= 3.1 all extensions are visible within the common profile GL2GL3. Please review!
Diffstat (limited to 'make/config/jogl')
-rw-r--r--make/config/jogl/gl-common.cfg6
-rw-r--r--make/config/jogl/gl-if-CustomJavaCode-gl2_gl3.java5
2 files changed, 10 insertions, 1 deletions
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 74af5cff4..026b25695 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -334,11 +334,15 @@ IgnoreExtension GL_EXT_vertex_attrib_64bit
RenameExtensionIntoCore GL_ARB_viewport_array
# <<< OpenGL 4.1
+# >>> OpenGL 4.2
+# Rename extension suffices (if exist) subsumed in OpenGL 4.2 (from OpenGL 4.2 spec, Appendix L.1)
+# <<< OpenGL 4.2
+
# Ignore a few obsolete versions of extensions that have been subsumed into the core or ARB extensions
IgnoreExtension GL_EXT_multisample
IgnoreExtension GL_EXT_point_parameters
IgnoreExtension GL_EXT_separate_shader_objects
-
+IgnoreExtension GL_EXT_shader_image_load_store
#
# Opaques and other directives for platform-independent routines
diff --git a/make/config/jogl/gl-if-CustomJavaCode-gl2_gl3.java b/make/config/jogl/gl-if-CustomJavaCode-gl2_gl3.java
index 1777c1557..e7351076b 100644
--- a/make/config/jogl/gl-if-CustomJavaCode-gl2_gl3.java
+++ b/make/config/jogl/gl-if-CustomJavaCode-gl2_gl3.java
@@ -5,4 +5,9 @@ public static final int GL_INVALID_INDEX = 0xFFFFFFFF ;
/** Part of <code>GL_ARB_sync</code> */
public static final long GL_TIMEOUT_IGNORED = 0xFFFFFFFFFFFFFFFFL ;
+/** Part of <code>GL_ARB_separate_shader_objects</code> */
+public static final int GL_ALL_SHADER_BITS = 0xFFFFFFFF ;
+
+/** Part of <code>GL_ARB_shader_image_load_store</code> */
+public static final int GL_ALL_BARRIER_BITS = 0xFFFFFFFF ;