Mercurial > hg > orthanc-stone
diff Framework/Scene2D/Internals/OpenGLTextProgram.cpp @ 611:e3f21a265be5
Added version directive to GLSL shader code + glew init function in sample code
AND commented-out glew init function in StoneInitialize
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Tue, 30 Apr 2019 16:07:48 +0200 |
| parents | bbe29efd3d1c |
| children | 9a474e90e832 8b6adfb62a2f |
line wrap: on
line diff
--- a/Framework/Scene2D/Internals/OpenGLTextProgram.cpp Tue Apr 30 09:17:45 2019 +0200 +++ b/Framework/Scene2D/Internals/OpenGLTextProgram.cpp Tue Apr 30 16:07:48 2019 +0200 @@ -20,6 +20,7 @@ #include "OpenGLTextProgram.h" +#include "OpenGLShaderVersionDirective.h" #include "../../Fonts/OpenGLTextCoordinates.h" @@ -29,6 +30,7 @@ static const unsigned int COMPONENTS = 2; static const char* VERTEX_SHADER = + ORTHANC_STONE_OPENGL_SHADER_VERSION_DIRECTIVE "attribute vec2 a_texcoord; \n" "attribute vec4 a_position; \n" "uniform mat4 u_matrix; \n" @@ -40,6 +42,7 @@ "}"; static const char* FRAGMENT_SHADER = + ORTHANC_STONE_OPENGL_SHADER_VERSION_DIRECTIVE "uniform sampler2D u_texture; \n" "uniform vec3 u_color; \n" "varying vec2 v_texcoord; \n"