Delete ImageFactory and ImageFactoryCache as they are unused

[platform/core/uifw/dali-core.git] / dali / internal / event / rendering / texture-set-impl.h

diff --git a/dali/internal/event/rendering/texture-set-impl.h b/dali/internal/event/rendering/texture-set-impl.h
index a8d0892..1916e53 100644 (file)
--- a/dali/internal/event/rendering/texture-set-impl.h
+++ b/dali/internal/event/rendering/texture-set-impl.h
@@ -24,12 +24,14 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h> // DALI_ASSERT_ALWAYS
 #include <dali/public-api/common/intrusive-ptr.h> // Dali::IntrusivePtr
-#include <dali/devel-api/rendering/texture-set.h> // Dali::TextureSet
+#include <dali/public-api/rendering/texture-set.h> // Dali::TextureSet
 #include <dali/internal/event/common/connectable.h> // Dali::Internal::Connectable
 #include <dali/internal/event/common/object-connector.h> // Dali::Internal::ObjectConnector
 #include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object
 #include <dali/internal/event/common/property-buffer-impl.h> // Dali::Internal::PropertyBuffer
+#include <dali/internal/event/images/image-impl.h> // Dali::Internal::Image
 #include <dali/internal/event/rendering/sampler-impl.h> // Dali::Internal::Sampler
+#include <dali/internal/event/rendering/texture-impl.h> // Dali::Internal::Texture
 #include <dali/internal/event/rendering/shader-impl.h> // Dali::Internal::Shader
 
 namespace Dali
@@ -63,11 +65,21 @@ public:
   void SetImage( size_t index, ImagePtr image );
 
   /**
+   * @copydoc Dali::TextureSet::SetTexture()
+   */
+  void SetTexture( size_t index, NewTexturePtr texture );
+
+  /**
    * @copydoc Dali::TextureSet::GetImage()
    */
   Image* GetImage( size_t index ) const;
 
   /**
+   * @copydoc Dali::TextureSet::GetTexture()
+   */
+  NewTexture* GetTexture( size_t index ) const;
+
+  /**
    * @copydoc Dali::TextureSet::SetSampler()
    */
   void SetSampler( size_t index, SamplerPtr sampler );
@@ -107,17 +119,6 @@ public: // Functions from Connectable
 
 private: // implementation
 
-  struct Texture
-  {
-    Texture()
-    :image(NULL),
-     sampler( NULL )
-    {}
-
-    ImagePtr    image;
-    SamplerPtr  sampler;
-  };
-
   TextureSet();
 
   /**
@@ -138,7 +139,9 @@ private: // unimplemented methods
 private: // Data
   EventThreadServices& mEventThreadServices;    ///<Used to send messages to the update thread
   SceneGraph::TextureSet* mSceneObject;
-  std::vector<Texture> mTextures;
+  std::vector<ImagePtr> mImages;
+  std::vector<SamplerPtr> mSamplers;
+  std::vector<NewTexturePtr> mNewTextures;
   bool mOnStage;
 
 };