Merge "DALi Version 1.0.31" into tizen

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

diff --git a/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp b/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp
index ab34479..c09f7c0 100644 (file)
--- a/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp
+++ b/dali-toolkit/public-api/shader-effects/alpha-discard-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.
+ *
+ */
 
 // CLASS HEADER
 #include <dali-toolkit/public-api/shader-effects/alpha-discard-effect.h>
@@ -36,7 +37,7 @@ AlphaDiscardEffect AlphaDiscardEffect::New()
   const char* ALPHA_DISCARD_FRAGMENT_SHADER_SOURCE =
       "void main()                                                    \n"
       "{                                                              \n"
-      "  vec4 color = texture2D( sTexture, vTexCoord );               \n"
+      "  mediump vec4 color = texture2D( sTexture, vTexCoord );       \n"
       "  if(color.a <= 0.0001)                                        \n"
       "  {                                                            \n"
       "    discard;                                                   \n"