Merge "Implemented Upload methods in Texture to upload data from PixelData objects...

[platform/core/uifw/dali-core.git] / dali / internal / render / common / render-manager.cpp

diff --git a/dali/internal/render/common/render-manager.cpp b/dali/internal/render/common/render-manager.cpp
index d613ad7..85af820 100644 (file)
--- a/dali/internal/render/common/render-manager.cpp
+++ b/dali/internal/render/common/render-manager.cpp
@@ -325,7 +325,7 @@ void RenderManager::RemoveTexture( Render::NewTexture* texture )
 
   TextureOwnerContainer& textures = mImpl->textureContainer;
 
-  // Find the sampler
+  // Find the texture
   for ( TextureOwnerIter iter = textures.Begin(); iter != textures.End(); ++iter )
   {
     if ( *iter == texture )
@@ -337,9 +337,9 @@ void RenderManager::RemoveTexture( Render::NewTexture* texture )
   }
 }
 
-void RenderManager::UploadTexture( Render::NewTexture* texture, Vector<unsigned char>& buffer, const TextureUploadParams& params )
+void RenderManager::UploadTexture( Render::NewTexture* texture, PixelDataPtr pixelData, const NewTexture::UploadParams& params )
 {
-  texture->Upload( mImpl->context, buffer, params );
+  texture->Upload( mImpl->context, pixelData, params );
 }
 
 void RenderManager::GenerateMipmaps( Render::NewTexture* texture )
@@ -514,8 +514,6 @@ bool RenderManager::Render( Integration::RenderStatus& status )
   // Core::Render documents that GL context must be current before calling Render
   DALI_ASSERT_DEBUG( mImpl->context.IsGlContextCreated() );
 
-  status.SetHasRendered( false );
-
   // Increment the frame count at the beginning of each frame
   ++(mImpl->frameCount);
 
@@ -563,12 +561,6 @@ bool RenderManager::Render( Integration::RenderStatus& status )
         RenderInstruction& instruction = mImpl->instructions.At( mImpl->renderBufferIndex, i );
 
         DoRender( instruction, *mImpl->defaultShader );
-
-        const RenderListContainer::SizeType countRenderList = instruction.RenderListCount();
-        if ( countRenderList > 0 )
-        {
-          status.SetHasRendered( true );
-        }
       }
       GLenum attachments[] = { GL_DEPTH, GL_STENCIL };
       mImpl->context.InvalidateFramebuffer(GL_FRAMEBUFFER, 2, attachments);