Distinguish NativeImage from Image & Clean PixelFormat from ImageAttribute and Texture

[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 a44f54b..0076934 100644 (file)
--- a/dali/internal/render/gl-resources/native-texture.h
+++ b/dali/internal/render/gl-resources/native-texture.h
@@ -19,7 +19,8 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/images/native-image.h>
+#include <dali/integration-api/gl-defines.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/internal/render/gl-resources/texture.h>
 
 namespace Dali
@@ -45,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.
@@ -55,7 +56,7 @@ public:
   /**
    * @copydoc Texture::Bind
    */
-  virtual bool Bind(GLenum target, GLenum textureunit = GL_TEXTURE0);
+  virtual bool Bind( GLenum target, TextureUnit textureunit );
 
   /**
    * @copydoc Texture::IsFullyOpaque
@@ -67,12 +68,6 @@ public:
    */
   virtual bool HasAlphaChannel() const;
 
-
-  /**
-   * @copydoc Texture::GetPixelFormat
-   */
-  virtual Pixel::Format GetPixelFormat() const;
-
   /**
    * @copydoc Texture::Init
    */
@@ -92,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