Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2016-09-20 17:12:50 +0300
committerMike Erwin <significant.bit@gmail.com>2016-09-20 17:13:01 +0300
commitd3365c5c725e8876e0cb4bf82f8fee49ddea67d8 (patch)
tree91dd8f52de6129ffa63c298b118ff365eeacb7f4 /source/blender/gpu/shaders/gpu_shader_text_vert.glsl
parent42ad5952ff0344bf9cf8dea3d3297a1fd1af6601 (diff)
OpenGL: fix GPU_SHADER_TEXT on non-Mac
Developed on Mac and committed quickly.. oops
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_text_vert.glsl')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_text_vert.glsl10
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_text_vert.glsl b/source/blender/gpu/shaders/gpu_shader_text_vert.glsl
index 72479401568..bdbffdfcf51 100644
--- a/source/blender/gpu/shaders/gpu_shader_text_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_text_vert.glsl
@@ -1,11 +1,15 @@
// TODO(merwin):
-// - use modern GLSL
// - uniform color, not per vertex
// - generic attrib inputs (2D pos, tex coord)
-flat varying vec4 color;
-noperspective varying vec2 texcoord;
+#if __VERSION__ == 120
+ flat varying vec4 color;
+ noperspective varying vec2 texcoord;
+#else
+ flat out vec4 color;
+ noperspective out vec2 texcoord;
+#endif
void main()
{