From 503adbfd85cae2946ea63ab1ec17b38006562821 Mon Sep 17 00:00:00 2001 From: "jul..om" <julien.gouesse@gmail.com> Date: Fri, 1 Mar 2013 17:24:51 +0000 Subject: [PATCH] Tolerates a failure in the parsing of GLSL version string and then assumes GLSL 1.00 is supported only on the Raspberry Pi git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10455 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java b/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java index e9f9bb88e..b4eea9b58 100644 --- a/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java +++ b/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java @@ -69,6 +69,7 @@ import java.util.EnumSet; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import javax.media.nativewindow.NativeWindowFactory; import javax.media.opengl.GL; import javax.media.opengl.GL2; import javax.media.opengl.GL2ES1; @@ -188,13 +189,15 @@ public class JoglRenderer implements Renderer { versionStr = versionStr.substring(0, spaceIdx); } - //FIXME revisit this fix later try { float version = Float.parseFloat(versionStr); glslVer = (int) (version * 100); } catch (NumberFormatException e) { - logger.warning("Failed parsing GLSL version assuming it's v1.00"); - glslVer = 100; + // the parsing fails on Raspberry Pi + if (NativeWindowFactory.getNativeWindowType(false).equals(NativeWindowFactory.TYPE_BCM_VC_IV)) { + logger.warning("Failed parsing GLSL version assuming it's v1.00"); + glslVer = 100; + } } switch (glslVer) {