From 6ed4be1f165f86ca97ee1a3c85ca60bb02dc1a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xerxes=20R=C3=A5nby?= Date: Sat, 30 Mar 2013 22:42:39 +0100 Subject: [PATCH] Fix PGLListener init extension checks to pass on OpenGL ES 2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Xerxes Rånby --- core/src/processing/opengl/PGL.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java index 2fb88edd5..3eef79d3a 100644 --- a/core/src/processing/opengl/PGL.java +++ b/core/src/processing/opengl/PGL.java @@ -3248,19 +3248,11 @@ public class PGL { context = adrawable.getContext(); capabilities = adrawable.getChosenGLCapabilities(); - gl = context.getGL(); - String extensions = gl.glGetString(GL.GL_EXTENSIONS); - if (-1 == extensions.indexOf("_framebuffer_object")) { - throw new RuntimeException("No framebuffer objects available"); + if (!context.hasBasicFBOSupport()) { + throw new RuntimeException("No basic FBO support is available"); } - if (-1 == extensions.indexOf("_vertex_buffer_object")) { - throw new RuntimeException("No vertex buffer objects available"); - } - if (-1 == extensions.indexOf("_vertex_shader")) { - throw new RuntimeException("No vertex shaders available"); - } - if (-1 == extensions.indexOf("_fragment_shader")) { - throw new RuntimeException("No fragment shaders available"); + if (!context.hasGLSL()) { + throw new RuntimeException("No GLSL support is available"); } }