Initial removal of Text features

[platform/core/uifw/dali-core.git] / dali / internal / event / effects / shader-effect-impl.cpp

diff --git a/dali/internal/event/effects/shader-effect-impl.cpp b/dali/internal/event/effects/shader-effect-impl.cpp
index ab85eb8..bf77f68 100644 (file)
--- a/dali/internal/event/effects/shader-effect-impl.cpp
+++ b/dali/internal/event/effects/shader-effect-impl.cpp
@@ -95,10 +95,6 @@ WrapperStrings customShaderWrappers [] =
     CustomImagePostfixVertex, CustomImagePostfixFragment
   },
   {
-    CustomTextDistanceFieldPrefixVertex, CustomTextDistanceFieldPrefixFragment,
-    CustomTextDistanceFieldPostfixVertex, CustomTextDistanceFieldPostfixFragment
-  },
-  {
     CustomUntexturedMeshPrefixVertex, CustomUntexturedMeshPrefixFragment,
     CustomUntexturedMeshPostfixVertex, CustomUntexturedMeshPostfixFragment
   },
@@ -144,19 +140,14 @@ void WrapAndSetProgram( Internal::ShaderEffect& effect,
         index = 0;
         break;
       }
-      case GEOMETRY_TYPE_TEXT:
-      {
-        index = 1;
-        break;
-      }
       case GEOMETRY_TYPE_UNTEXTURED_MESH:
       {
-        index = 2;
+        index = 1;
         break;
       }
       case GEOMETRY_TYPE_TEXTURED_MESH:
       {
-        index = 3;
+        index = 2;
         break;
       }
       case GEOMETRY_TYPE_LAST:
@@ -346,7 +337,6 @@ void ShaderEffect::SetPrograms( GeometryType geometryType,
   }
 
   WrapAndSetProgram( *this, geometryType, GEOMETRY_TYPE_IMAGE, vertexPrefix, fragmentPrefix, vertexSource, fragmentSource, modifiesGeometry );
-  WrapAndSetProgram( *this, geometryType, GEOMETRY_TYPE_TEXT, vertexPrefix, fragmentPrefix, vertexSource, fragmentSource, modifiesGeometry );
   WrapAndSetProgram( *this, geometryType, GEOMETRY_TYPE_TEXTURED_MESH, vertexPrefix, fragmentPrefix, vertexSource, fragmentSource, modifiesGeometry );
   WrapAndSetProgram( *this, geometryType, GEOMETRY_TYPE_UNTEXTURED_MESH, vertexPrefix, fragmentPrefix, vertexSource, fragmentSource, modifiesGeometry );
 }
@@ -515,10 +505,6 @@ void ShaderEffect::SetDefaultProperty( Property::Index index, const Property::Va
         {
           geometryType  = GEOMETRY_TYPE_IMAGE;
         }
-        else if (s == "GEOMETRY_TYPE_TEXT")
-        {
-          geometryType  = GEOMETRY_TYPE_TEXT;
-        }
         else if( s == "GEOMETRY_TYPE_UNTEXTURED_MESH")
         {
           geometryType  = GEOMETRY_TYPE_UNTEXTURED_MESH;