summaryrefslogtreecommitdiff
path: root/slideshow/opengl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-10-26 12:52:22 +0200
committerTor Lillqvist <tml@collabora.com>2015-10-26 13:04:30 +0200
commit8c84777c46bf0863b2fc01a547de8ba87805f5c8 (patch)
treec28f492f3b68582a83d792faec37a6bf961a4f03 /slideshow/opengl
parent5b1bd78bbaf09ecdd375f488b92a271b0b579b04 (diff)
Actually, the permTexture is 256*256 pixels
Change-Id: Ia32c98d8162f31a8ee0b0d0c1301ca204c9c3c87
Diffstat (limited to 'slideshow/opengl')
-rw-r--r--slideshow/opengl/dissolveFragmentShader.glsl4
1 files changed, 1 insertions, 3 deletions
diff --git a/slideshow/opengl/dissolveFragmentShader.glsl b/slideshow/opengl/dissolveFragmentShader.glsl
index adc4e163d71a..c6e80e2a6931 100644
--- a/slideshow/opengl/dissolveFragmentShader.glsl
+++ b/slideshow/opengl/dissolveFragmentShader.glsl
@@ -38,9 +38,7 @@ float snoise(vec2 P) {
}
void main() {
- // No idea why the multiplication by 10 (and not 16, which would seem more logical to me, as
- // the permTexture is 16*16 pixels in size).
- float sn = snoise(10.0*v_texturePosition);
+ float sn = snoise(256*v_texturePosition);
if( sn < time)
gl_FragColor = texture2D(enteringSlideTexture, v_texturePosition);
else