[Libreoffice-commits] core.git: slideshow/opengl

Emmanuel Gil Peyrot emmanuel.peyrot at collabora.com
Tue Feb 2 09:23:57 UTC 2016


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

New commits:
commit 8b65dec8e0fdfc8564597e90aff91b971e23f7ce
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

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) {


More information about the Libreoffice-commits mailing list