summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>2016-01-27 20:21:21 +0000
committerTomaž Vajngerl <quikee@gmail.com>2016-02-02 11:12:59 +0000
commit59be03a2f0692c424299c8b2b3acdf1682bb1c1f (patch)
treed0ca28a682bb7e50647e9636d770bfb963ed8cfc /slideshow
parent11c865031cffc170d3db6b00fb48c683fb4ff070 (diff)
slideshow: Make sure the slide is fully opaque in Honeycomb
On Windows, the text is rendered with 0 of alpha, which is an issue in this transition as it enables GL_BLEND. Change-Id: I45fe32ccf77854e758eddc33f300791d4cdd6904 (cherry picked from commit 8b65dec8e0fdfc8564597e90aff91b971e23f7ce) Reviewed-on: https://gerrit.libreoffice.org/22021 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/opengl/honeycombFragmentShader.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/slideshow/opengl/honeycombFragmentShader.glsl b/slideshow/opengl/honeycombFragmentShader.glsl
index 325e39348581..7e529517915f 100644
--- a/slideshow/opengl/honeycombFragmentShader.glsl
+++ b/slideshow/opengl/honeycombFragmentShader.glsl
@@ -26,7 +26,7 @@ bool isBorder(vec2 point)
void main()
{
- vec4 fragment = texture2D(slideTexture, texturePosition);
+ vec4 fragment = vec4(texture2D(slideTexture, texturePosition).rgb, 1.0);
vec3 lightVector = vec3(0.0, 0.0, 1.0);
float light = max(dot(lightVector, normal), 0.0);
if (hexagonSize > 1.0) {