diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-10-26 13:15:15 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-10-26 13:17:39 +0200 |
| commit | 2e61410d2545c1dee0c5aad4ea01b29f0a907e61 (patch) | |
| tree | 6282c0b15e203ef2d4750d79fc122bbaafaf84f3 /slideshow | |
| parent | 8c84777c46bf0863b2fc01a547de8ba87805f5c8 (diff) | |
Bin dead code
We already have an if statement for (time < PART) right above.
Change-Id: I43b817dd6d0a11be4ed51a5bd378806447abf69c
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/opengl/staticFragmentShader.glsl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/slideshow/opengl/staticFragmentShader.glsl b/slideshow/opengl/staticFragmentShader.glsl index c3cb6693ab21..cd47c5ad6fd7 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 |