From 0d59bd4c655ef9a27f127000848aae7f07f240ae Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 6 Mar 2015 09:45:48 +0100 Subject: Bug 1135 - Change all GlueGen config files, supporting EGL 1.5 , ES 3.1 and GL 4.5 --- make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java') diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java index 8ec1b3205..09edaaf7d 100644 --- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java @@ -117,6 +117,11 @@ public final boolean isGLES3Compatible() { return _context.isGLES3Compatible(); } +@Override +public final boolean isGLES31Compatible() { + return _context.isGLES31Compatible(); +} + @Override public final boolean isGL2GL3() { return _context.isGL2GL3(); @@ -254,15 +259,6 @@ public final GLES3 getGLES3() throws GLException { public final boolean isNPOTTextureAvailable() { return _context.isNPOTTextureAvailable(); } -@Override -public final java.nio.ByteBuffer glAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority) { - return _context.glAllocateMemoryNV(size, readFrequency, writeFrequency, priority); -} - -@Override -public final void glFreeMemoryNV(java.nio.ByteBuffer pointer) { - _context.glFreeMemoryNV(pointer); -} // // Helpers for ensuring the correct amount of texture data @@ -369,7 +365,7 @@ private final boolean checkIndirectVBOUnbound(boolean throwException) { return checkBufferObject(haveGL15 || haveARBVertexBufferObject, haveARBVertexArrayObject, // allowVAO false, // bound - GL4.GL_DRAW_INDIRECT_BUFFER, + GL4ES3.GL_DRAW_INDIRECT_BUFFER, "indirect vertex_buffer_object", throwException); } @@ -377,7 +373,7 @@ private final boolean checkIndirectVBOBound(boolean throwException) { return checkBufferObject(haveGL15 || haveARBVertexBufferObject, haveARBVertexArrayObject, // allowVAO true, // bound - GL4.GL_DRAW_INDIRECT_BUFFER, + GL4ES3.GL_DRAW_INDIRECT_BUFFER, "indirect vertex_buffer_object", throwException); } -- cgit v1.2.3