X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Frendering%2Ftexture-set-impl.cpp;h=349eaa65ee12f07f8dbddeb5083e0c6d650b0d50;hb=14502a507909174b52e486a0ee7516cb26e6ad45;hp=5d018f3f4c829ecd1d2f04854dd6a52ab0e21b6d;hpb=6888a05ee6b303b783e6b66a44fdc8083e565ec0;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/rendering/texture-set-impl.cpp b/dali/internal/event/rendering/texture-set-impl.cpp
index 5d018f3..349eaa6 100644
--- a/dali/internal/event/rendering/texture-set-impl.cpp
+++ b/dali/internal/event/rendering/texture-set-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
-#include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
+#include <dali/internal/event/common/stage-impl.h>
 #include <dali/internal/update/manager/update-manager.h>
 #include <dali/internal/update/rendering/scene-graph-texture-set.h>
 
@@ -36,12 +36,12 @@ TextureSetPtr TextureSet::New()
   return textureSet;
 }
 
-void TextureSet::SetTexture( size_t index, NewTexturePtr texture )
+void TextureSet::SetTexture( uint32_t index, TexturePtr texture )
 {
-  size_t textureCount( mNewTextures.size() );
+  uint32_t textureCount = static_cast<uint32_t>( mTextures.size() );
   if( index >= textureCount )
   {
-    mNewTextures.resize(index + 1);
+    mTextures.resize(index + 1);
 
     bool samplerExist = true;
     if( mSamplers.size() < index + 1 )
@@ -50,9 +50,9 @@ void TextureSet::SetTexture( size_t index, NewTexturePtr texture )
       samplerExist = false;
     }
 
-    for( size_t i(textureCount); i<=index; ++i )
+    for( uint32_t i(textureCount); i<=index; ++i )
     {
-      mNewTextures[i] = NULL;
+      mTextures[i] = NULL;
 
       if( !samplerExist )
       {
@@ -61,9 +61,9 @@ void TextureSet::SetTexture( size_t index, NewTexturePtr texture )
     }
   }
 
-  mNewTextures[index]= texture;
+  mTextures[index]= texture;
 
-  Render::NewTexture* renderTexture(0);
+  Render::Texture* renderTexture(0);
   if( texture )
   {
     renderTexture = texture->GetRenderObject();
@@ -72,12 +72,12 @@ void TextureSet::SetTexture( size_t index, NewTexturePtr texture )
   SceneGraph::SetTextureMessage( mEventThreadServices, *mSceneObject, index, renderTexture );
 }
 
-NewTexture* TextureSet::GetTexture( size_t index ) const
+Texture* TextureSet::GetTexture( uint32_t index ) const
 {
-  NewTexture* result(0);
-  if( index < mNewTextures.size() )
+  Texture* result(0);
+  if( index < mTextures.size() )
   {
-    result = mNewTextures[index].Get();
+    result = mTextures[index].Get();
   }
   else
   {
@@ -87,13 +87,13 @@ NewTexture* TextureSet::GetTexture( size_t index ) const
   return result;
 }
 
-void TextureSet::SetSampler( size_t index, SamplerPtr sampler )
+void TextureSet::SetSampler( uint32_t index, SamplerPtr sampler )
 {
-  size_t samplerCount( mSamplers.size() );
+  uint32_t samplerCount = static_cast<uint32_t>( mSamplers.size() );
   if( samplerCount < index + 1  )
   {
     mSamplers.resize( index + 1 );
-    for( size_t i(samplerCount); i<=index; ++i )
+    for( uint32_t i = samplerCount; i<=index; ++i )
     {
       mSamplers[i] = NULL;
     }
@@ -110,7 +110,7 @@ void TextureSet::SetSampler( size_t index, SamplerPtr sampler )
   SceneGraph::SetSamplerMessage( mEventThreadServices, *mSceneObject, index, renderSampler );
 }
 
-Sampler* TextureSet::GetSampler( size_t index ) const
+Sampler* TextureSet::GetSampler( uint32_t index ) const
 {
   Sampler* result(0);
   if( index < mSamplers.size() )
@@ -125,9 +125,9 @@ Sampler* TextureSet::GetSampler( size_t index ) const
   return result;
 }
 
-size_t TextureSet::GetTextureCount() const
+uint32_t TextureSet::GetTextureCount() const
 {
-  return mNewTextures.size();
+  return static_cast<uint32_t>( mTextures.size() );
 }
 
 const SceneGraph::TextureSet* TextureSet::GetTextureSetSceneObject() const
@@ -146,7 +146,8 @@ void TextureSet::Initialize()
   SceneGraph::UpdateManager& updateManager = mEventThreadServices.GetUpdateManager();
 
   mSceneObject = SceneGraph::TextureSet::New();
-  AddTextureSetMessage( updateManager, *mSceneObject );
+  OwnerPointer< SceneGraph::TextureSet > transferOwnership( mSceneObject );
+  AddTextureSetMessage( updateManager, transferOwnership );
 }
 
 TextureSet::~TextureSet()