From ef1f3134222a99e36397e4c55998b645ec0bbd08 Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Wed, 14 Oct 2015 16:57:33 +0100 Subject: [PATCH 1/1] Remove some dead and non-thread safe internal uniforms Change-Id: I41058f8813f04a83f1b22cc38c71106a9b12b77a --- dali-toolkit/devel-api/shader-effects/motion-blur-effect.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h b/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h index a4aaa7f..17c2f65 100644 --- a/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h +++ b/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h @@ -102,7 +102,7 @@ inline ShaderEffect CreateMotionBlurEffect( unsigned int numBlurSamples = 8 ) vertexSource = "precision mediump float;\n" "uniform mat4 uModelLastFrame;\n" - "uniform float uTimeDelta;\n" + "float timeDelta = 0.0167;\n" "uniform float uGeometryStretchFactor;\n" "uniform float uSpeedScalingFactor;\n" @@ -118,7 +118,7 @@ inline ShaderEffect CreateMotionBlurEffect( unsigned int numBlurSamples = 8 ) " vec4 vertex = vec4(aPosition, 1.0);\n" " vec4 viewSpaceVertex = uModelView * vertex;\n" " vec4 viewSpaceVertexLastFrame = (uViewMatrix * uModelLastFrame) * vertex;\n" - " float reciprocalTimeDelta = 1.0 / ((uTimeDelta > 0.0) ? uTimeDelta : 0.01);\n" + " float reciprocalTimeDelta = 1.0 / timeDelta;\n" // work out vertex's last movement in view space " vec3 viewSpacePosDelta = viewSpaceVertex.xyz - viewSpaceVertexLastFrame.xyz;\n" -- 2.7.4