summaryrefslogtreecommitdiff
path: root/chart2/opengl/screenTextFragmentShader.glsl
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-08-15 06:37:37 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-09-02 01:08:43 +0200
commit8d61b3feee74263aff32e471f8d4230a74353ad5 (patch)
tree4359b8fcecd6697a340390da7f5ecb9f8d95762d /chart2/opengl/screenTextFragmentShader.glsl
parent249c5e0f211bbdcbffda91a446dedd33c314ee64 (diff)
texture*D in GLSL is deprecated and not available in core contexts
Change-Id: Ia5da0899d73aea22fe7bae735e57e30dcd37b254
Diffstat (limited to 'chart2/opengl/screenTextFragmentShader.glsl')
-rw-r--r--chart2/opengl/screenTextFragmentShader.glsl6
1 files changed, 4 insertions, 2 deletions
diff --git a/chart2/opengl/screenTextFragmentShader.glsl b/chart2/opengl/screenTextFragmentShader.glsl
index 7c90ec0e3eb0..f76abee1630e 100644
--- a/chart2/opengl/screenTextFragmentShader.glsl
+++ b/chart2/opengl/screenTextFragmentShader.glsl
@@ -12,10 +12,12 @@
in vec2 vTexCoord;
uniform sampler2D TextTex;
uniform vec4 textColor;
+out vec4 actualColor;
+
void main()
{
- vec3 color = texture2D(TextTex, vTexCoord).rgb;
- gl_FragColor = vec4(textColor.rgb, 1.0 - color.r);
+ vec3 color = texture(TextTex, vTexCoord).rgb;
+ actualColor = vec4(textColor.rgb, 1.0 - color.r);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */