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 02ab1b3..30e778e 100644 (file)
--- a/dali/internal/render/gl-resources/native-texture.h
+++ b/dali/internal/render/gl-resources/native-texture.h
@@ -1,24 +1,26 @@
 #ifndef __DALI_INTERNAL_NATIVE_TEXTURE_H__
 #define __DALI_INTERNAL_NATIVE_TEXTURE_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/images/native-image.h>
+#include <dali/integration-api/gl-defines.h>
+#include <dali/devel-api/images/native-image-interface.h>
 #include <dali/internal/render/gl-resources/texture.h>
 
 namespace Dali
@@ -44,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.
@@ -54,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
@@ -66,12 +68,6 @@ public:
    */
   virtual bool HasAlphaChannel() const;
 
-
-  /**
-   * @copydoc Texture::GetPixelFormat
-   */
-  virtual Pixel::Format GetPixelFormat() const;
-
   /**
    * @copydoc Texture::Init
    */
@@ -91,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