[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - slideshow/opengl

[Emmanuel Gil Peyrot]

 slideshow/opengl/honeycombFragmentShader.glsl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59be03a2f0692c424299c8b2b3acdf1682bb1c1f
Author: Emmanuel Gil Peyrot <emmanuel.peyrot at collabora.com>
Date:   Wed Jan 27 20:21:21 2016 +0000

    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 at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/slideshow/opengl/honeycombFragmentShader.glsl b/slideshow/opengl/honeycombFragmentShader.glsl
index 325e393..7e52951 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) {