[dali_1.4.39] Merge branch 'devel/master'

Change-Id: I8e78dabc97b598532c4d2671e20b200e23bc3195

diff --git a/dali/internal/render/renderers/render-texture-frame-buffer.cpp b/dali/internal/render/renderers/render-texture-frame-buffer.cpp
index 4e5cd51..fb718fb 100644 (file)
--- a/dali/internal/render/renderers/render-texture-frame-buffer.cpp
+++ b/dali/internal/render/renderers/render-texture-frame-buffer.cpp
@@ -89,15 +89,7 @@ void TextureFrameBuffer::AttachColorTexture( Context& context, Render::Texture*
   // Create a color attachment.
   if( texture->GetType() == TextureType::TEXTURE_2D )
   {
-    if( !texture->IsNativeImage() )
-    {
-      context.FramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextureId, mipmapLevel );
-    }
-    else
-    {
-      // If it's a native image we need to use GL_TEXTURE_EXTERNAL_OES as the texture target parameter
-      context.FramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_EXTERNAL_OES, mTextureId, mipmapLevel );
-    }
+    context.FramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture->GetTarget(), mTextureId, mipmapLevel );
   }
   else
   {

diff --git a/dali/internal/render/renderers/render-texture.cpp b/dali/internal/render/renderers/render-texture.cpp
index a2f11bc..2937453 100644 (file)
--- a/dali/internal/render/renderers/render-texture.cpp
+++ b/dali/internal/render/renderers/render-texture.cpp
@@ -912,7 +912,7 @@ void Texture::ApplySampler( Context& context, Render::Sampler* sampler )
   }
 }
 
-bool Texture::HasAlphaChannel()
+bool Texture::HasAlphaChannel() const
 {
   return mHasAlpha;
 }

diff --git a/dali/internal/render/renderers/render-texture.h b/dali/internal/render/renderers/render-texture.h
index 86f32f1..e23d28a 100755 (executable)
--- a/dali/internal/render/renderers/render-texture.h
+++ b/dali/internal/render/renderers/render-texture.h
@@ -108,18 +108,27 @@ public:
    * Retrieve wheter the texture has an alpha channel
    * @return True if the texture has alpha channel, false otherwise
    */
-  bool HasAlphaChannel();
+  bool HasAlphaChannel() const;
 
   /**
    * Get the id of the texture
    * @return Id of the texture
    */
-  GLuint GetId()
+  GLuint GetId() const
   {
     return mId;
   }
 
   /**
+   * Get the target to which the texture is bound
+   * @return target to which the texture is bound
+   */
+  GLuint GetTarget() const
+  {
+    return mTarget;
+  }
+
+  /**
    * Get the type of the texture
    * @return Type of the texture
    */

diff --git a/dali/public-api/dali-core-version.cpp b/dali/public-api/dali-core-version.cpp
index e6af6ad..844061f 100644 (file)
--- a/dali/public-api/dali-core-version.cpp
+++ b/dali/public-api/dali-core-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const uint32_t CORE_MAJOR_VERSION = 1;
 const uint32_t CORE_MINOR_VERSION = 4;
-const uint32_t CORE_MICRO_VERSION = 38;
+const uint32_t CORE_MICRO_VERSION = 39;
 const char * const CORE_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali.spec b/packaging/dali.spec
index 02eb142..db16198 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -1,6 +1,6 @@
 Name:       dali
 Summary:    DALi 3D Engine
-Version:    1.4.38
+Version:    1.4.39
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT