Merge changes I7fd36a6d,I2c2e4fe7 into devel/new_mesh

[platform/core/uifw/dali-core.git] / dali / internal / render / gl-resources / native-texture.h

diff --git a/dali/internal/render/gl-resources/native-texture.h b/dali/internal/render/gl-resources/native-texture.h
index b91a04e..30e778e 100644 (file)
--- a/dali/internal/render/gl-resources/native-texture.h
+++ b/dali/internal/render/gl-resources/native-texture.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/gl-defines.h>
-#include <dali/public-api/images/native-image.h>
+#include <dali/devel-api/images/native-image-interface.h>
 #include <dali/internal/render/gl-resources/texture.h>
 
 namespace Dali
@@ -46,7 +46,7 @@ public:
    * @param nativeImg         the NativeImage to be used
    * @param context           the GL context
    */
-  NativeTexture(NativeImage* nativeImg, Context& context);
+  NativeTexture(NativeImageInterface* nativeImg, Context& context);
 
   /**
    * Destructor.
@@ -68,12 +68,6 @@ public:
    */
   virtual bool HasAlphaChannel() const;
 
-
-  /**
-   * @copydoc Texture::GetPixelFormat
-   */
-  virtual Pixel::Format GetPixelFormat() const;
-
   /**
    * @copydoc Texture::Init
    */
@@ -93,7 +87,7 @@ protected:
 
 private:
 
-  NativeImagePtr mNativeImage; ///< reference to NativeImage the Texture was created from
+  NativeImageInterfacePtr mNativeImage; ///< reference to NativeImage the Texture was created from
 };
 
 }  //namespace Internal