From 444759fad6e3d18c730a2d80a33c39d1dbc84496 Mon Sep 17 00:00:00 2001 From: deltaoscarmike <37912794+deltaoscarmike@users.noreply.github.com> Date: Sun, 10 Jun 2018 19:23:41 +0200 Subject: [PATCH] switching glsl version depends of --enable-gles configure flag fix vao memleak --- src/libprojectM/Renderer/ShaderEngine.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libprojectM/Renderer/ShaderEngine.cpp b/src/libprojectM/Renderer/ShaderEngine.cpp index b7ac3ee2c8..e22f13624f 100644 --- a/src/libprojectM/Renderer/ShaderEngine.cpp +++ b/src/libprojectM/Renderer/ShaderEngine.cpp @@ -9,7 +9,11 @@ #include "ShaderEngine.hpp" #include "BeatDetect.hpp" -#define GLSL_VERSION "410" +#ifdef USE_GLES + #define GLSL_VERSION "300 es" +#else + #define GLSL_VERSION "410" +#endif std::string v2f_c4f_vert( "#version " @@ -94,6 +98,7 @@ ShaderEngine::ShaderEngine() SetupCg(); #endif + // glValidateProgram needs a VAO for its checks GLuint m_temp_vao; glGenVertexArrays(1, &m_temp_vao); glBindVertexArray(m_temp_vao); @@ -105,6 +110,8 @@ ShaderEngine::ShaderEngine() UNIFORM_V2F_C4F_VERTEX_POINT_SIZE = glGetUniformLocation(programID_v2f_c4f, "vertex_point_size"); UNIFORM_V2F_C4F_T2F_VERTEX_TRANFORMATION = glGetUniformLocation(programID_v2f_c4f_t2f, "vertex_transformation"); UNIFORM_V2F_C4F_T2F_FRAG_TEXTURE_SAMPLER = glGetUniformLocation(programID_v2f_c4f_t2f, "texture_sampler"); + + glDeleteVertexArrays(1, &m_temp_vao); } ShaderEngine::~ShaderEngine()