Merge "Updated shader source to set precision explicitly" into tizen

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / public-api / shader-effects / bouncing-effect.cpp

diff --git a/base/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp b/base/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp
index 7698dda..9961fdf 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp
+++ b/base/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 #include <dali-toolkit/public-api/shader-effects/bouncing-effect.h>
 
@@ -47,6 +48,7 @@ BouncingEffect::~BouncingEffect()
 BouncingEffect BouncingEffect::New( const Vector4& color )
 {
   std::string fragmentShader = MAKE_STRING(
+      precision mediump float;\n
       uniform float uProgressRate;\n
       uniform vec4 uAssignedColor;\n
       void main()\n
@@ -80,7 +82,8 @@ BouncingEffect BouncingEffect::New( const Vector4& color )
   );
 
   ShaderEffect shaderEffect;
-  shaderEffect = ShaderEffect::New( "", fragmentShader, GeometryType( GEOMETRY_TYPE_IMAGE),
+  shaderEffect = ShaderEffect::New( "", fragmentShader,
+                                    GeometryType( GEOMETRY_TYPE_IMAGE),
                                     ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING ) );
   BouncingEffect handle( shaderEffect );