From 4d15acae441ee9ae86659aca8ff46d8c19306d1d Mon Sep 17 00:00:00 2001 From: gohai Date: Fri, 20 Jul 2018 11:41:47 -0700 Subject: [PATCH] OpenGL ES: Fix GLSL version number for 1.00 (#5582) Wikipedia had it wrong: the spec for the OpenGL ES Shading Language Version 1.00 defines the version preprocessor directive as "#version 100", and _not_ "#version 100 es", like version 3.00+ of the language wants it. This made the Raspberry Pi with the legacy driver unhappy. Thanks @DangusTaargus for reporting. see https://www.khronos.org/files/opengles_shading_language.pdf --- core/src/processing/opengl/PJOGL.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java index 99d591f28..c164c23b1 100644 --- a/core/src/processing/opengl/PJOGL.java +++ b/core/src/processing/opengl/PJOGL.java @@ -513,7 +513,8 @@ public class PJOGL extends PGL { @Override protected String getGLSLVersionSuffix() { - if (context.isGLESProfile()) { + VersionNumber vn = context.getGLSLVersionNumber(); + if (context.isGLESProfile() && 1 < vn.getMajor()) { return " es"; } else { return "";