From 35fd84cc52fa96e99d5fd8832bcf18bb307c23a4 Mon Sep 17 00:00:00 2001 From: jules Date: Sat, 22 Mar 2014 14:58:30 +0000 Subject: [PATCH] Better parsing of openGL SL version number. --- extras/Demo/Source/Demos/OpenGLDemo.cpp | 4 ---- .../juce_opengl/opengl/juce_OpenGLShaderProgram.cpp | 11 ++--------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/extras/Demo/Source/Demos/OpenGLDemo.cpp b/extras/Demo/Source/Demos/OpenGLDemo.cpp index bfdcd64745..d07c199dad 100644 --- a/extras/Demo/Source/Demos/OpenGLDemo.cpp +++ b/extras/Demo/Source/Demos/OpenGLDemo.cpp @@ -810,11 +810,7 @@ struct OpenGLDemoClasses attributes = new Attributes (openGLContext, *shader); uniforms = new Uniforms (openGLContext, *shader); - #if ! JUCE_OPENGL_ES statusText = "GLSL: v" + String (OpenGLShaderProgram::getLanguageVersion(), 2); - #else - statusText = "GLSL ES"; - #endif } else { diff --git a/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp b/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp index c4dd134f33..c7d709dca8 100644 --- a/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp +++ b/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp @@ -54,15 +54,8 @@ void OpenGLShaderProgram::release() noexcept double OpenGLShaderProgram::getLanguageVersion() { - #if JUCE_OPENGL_ES - // GLES doesn't support this version number, but that shouldn't matter since - // on GLES you probably won't need to check it. - jassertfalse; - return 0; - #else - return String ((const char*) glGetString (GL_SHADING_LANGUAGE_VERSION)) - .upToFirstOccurrenceOf (" ", false, false).getDoubleValue(); - #endif + return String::fromUTF8 ((const char*) glGetString (GL_SHADING_LANGUAGE_VERSION)) + .retainCharacters("1234567890.").getDoubleValue(); } bool OpenGLShaderProgram::addShader (const String& code, GLenum type)