Merge "Added devel APIs to add and remove external Texture and TextureSet to texture...

diff --combined dali-toolkit/internal/visuals/visual-factory-cache.h
index 17d2246,b4d270e..aac15c7
--- 1/dali-toolkit/internal/visuals/visual-factory-cache.h
--- 2/dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.h
@@@ -2,7 -2,7 +2,7 @@@
  #define DALI_TOOLKIT_VISUAL_FACTORY_CACHE_H
  
  /*
-  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+  * Copyright (c) 2017 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.
@@@ -28,7 -28,7 +28,7 @@@
  // INTERNAL INCLUDES
  #include <dali-toolkit/internal/visuals/npatch-loader.h>
  #include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
- #include <dali-toolkit/internal/visuals/texture-manager.h>
+ #include <dali-toolkit/internal/visuals/texture-manager-impl.h>
  
  namespace Dali
  {
@@@ -69,8 -69,7 +69,8 @@@ public
      IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
      NINE_PATCH_SHADER,
      SVG_SHADER,
 -    TEXT_SHADER,
 +    TEXT_SHADER_RGBA,
 +    TEXT_SHADER_L8,
      WIREFRAME_SHADER,
      SHADER_TYPE_MAX = WIREFRAME_SHADER
    };