Skip to content

switching glsl version depends of --enable-gles configure flag #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2018
Merged

switching glsl version depends of --enable-gles configure flag #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/libprojectM/Renderer/ShaderEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down Expand Up @@ -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);
Expand All @@ -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()
Expand Down