summaryrefslogtreecommitdiff
path: root/chart2/opengl
diff options
context:
space:
mode:
authorxukai <xukai@multicorewareinc.com>2014-09-22 17:40:30 +0800
committerKohei Yoshida <libreoffice@kohei.us>2014-09-23 14:56:17 +0000
commit7d833aa8a7e572dd266c1e9f52826cbdbfc95185 (patch)
tree74c04b37049101e12707c978189806086a914661 /chart2/opengl
parentb8c442f2b924b03533c7029af3ad10b79e8a89c3 (diff)
add translucent balck background for history rendering
Change-Id: I9da69bdb29bb780776355e79fab61d5d9bb844a4 Reviewed-on: https://gerrit.libreoffice.org/11583 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'chart2/opengl')
-rw-r--r--chart2/opengl/screenTextFragmentShader.glsl6
1 files changed, 3 insertions, 3 deletions
diff --git a/chart2/opengl/screenTextFragmentShader.glsl b/chart2/opengl/screenTextFragmentShader.glsl
index f76abee1630e..f60b54fd4248 100644
--- a/chart2/opengl/screenTextFragmentShader.glsl
+++ b/chart2/opengl/screenTextFragmentShader.glsl
@@ -13,11 +13,11 @@ in vec2 vTexCoord;
uniform sampler2D TextTex;
uniform vec4 textColor;
out vec4 actualColor;
-
void main()
{
- vec3 color = texture(TextTex, vTexCoord).rgb;
- actualColor = vec4(textColor.rgb, 1.0 - color.r);
+ vec3 color = texture2D(TextTex, vTexCoord).rgb;
+ actualColor = ((1.0 - color.r) == 0.0) ? vec4(0.0, 0.0, 0.0, textColor.a) :
+ vec4(textColor.rgb, 1.0);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */