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

Tor Lillqvist tml at collabora.com
Mon Oct 26 11:19:01 UTC 2015


 slideshow/opengl/staticFragmentShader.glsl |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 2e61410d2545c1dee0c5aad4ea01b29f0a907e61
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 26 13:15:15 2015 +0200

    Bin dead code
    
    We already have an if statement for (time < PART) right above.
    
    Change-Id: I43b817dd6d0a11be4ed51a5bd378806447abf69c

diff --git a/slideshow/opengl/staticFragmentShader.glsl b/slideshow/opengl/staticFragmentShader.glsl
index c3cb669..cd47c5a 100644
--- a/slideshow/opengl/staticFragmentShader.glsl
+++ b/slideshow/opengl/staticFragmentShader.glsl
@@ -53,8 +53,6 @@ void main() {
             gl_FragColor = ((time-START)/(PART - START))*vec4(sn, sn, sn, 1.0) + (1.0 - (time - START)/(PART - START))*texture2D(leavingSlideTexture, v_texturePosition);
         else
             gl_FragColor = texture2D(leavingSlideTexture, v_texturePosition);
-    } else if ( time < PART ) {
-            gl_FragColor = texture2D(leavingSlideTexture, v_texturePosition);
     } else if ( time > END ) {
         gl_FragColor = ((1.0 - time)/(1.0 - END))*vec4(sn, sn, sn, 1.0) + ((time - END)/(1.0 - END))*texture2D(enteringSlideTexture, v_texturePosition);
     } else 


More information about the Libreoffice-commits mailing list