diff options
| author | Sven Gothel <[email protected]> | 2014-02-23 14:51:06 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-02-23 14:51:06 +0100 |
| commit | 3352601e0860584509adf2b76f993d03893ded4b (patch) | |
| tree | 974fccc8c0eb2f5ad9d4ffd741dfc35869ed67b5 /make/config/jogl/gl-if-CustomJavaCode-es3.java | |
| parent | f51933f0ebe9ae030c26c066e59a728ce08b8559 (diff) | |
| parent | c67de337a8aaf52e36104c3f13e273aa19d21f1f (diff) | |
Merge branch 'master' into stash_glyphcache
Conflicts:
make/scripts/tests.sh
src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
src/jogl/classes/com/jogamp/graph/curve/Region.java
src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
src/jogl/classes/com/jogamp/graph/font/Font.java
src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
Diffstat (limited to 'make/config/jogl/gl-if-CustomJavaCode-es3.java')
| -rw-r--r-- | make/config/jogl/gl-if-CustomJavaCode-es3.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/make/config/jogl/gl-if-CustomJavaCode-es3.java b/make/config/jogl/gl-if-CustomJavaCode-es3.java new file mode 100644 index 000000000..3f976d514 --- /dev/null +++ b/make/config/jogl/gl-if-CustomJavaCode-es3.java @@ -0,0 +1,18 @@ + +/** Part of <code>GL_ARB_uniform_buffer_object</code> */ +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_shader_image_load_store</code> */ +public static final int GL_ALL_BARRIER_BITS = 0xFFFFFFFF ; + +/** @deprecated Avoid original GL API namespace conflict. Use {@link #isPBOPackBound()} */ +public boolean glIsPBOPackBound(); +public boolean isPBOPackBound(); + +/** @deprecated Avoid original GL API namespace conflict. Use {@link #isPBOUnpackBound()} */ +public boolean glIsPBOUnpackBound(); +public boolean isPBOUnpackBound(); + |