[dali_2.0.42] Merge branch 'devel/master'

[platform/core/uifw/dali-adaptor.git] / dali / internal / graphics / gles-impl / gles2-graphics-memory.cpp

diff --git a/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp b/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp
index 9330c8c..f4505d9 100644 (file)
--- a/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp
+++ b/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp
@@ -45,7 +45,7 @@ Memory2::Memory2(const Graphics::MapTextureInfo& mapInfo, EglGraphicsController&
 
 Memory2::~Memory2()
 {
-  //Unlock(true);
+  Unlock(true);
 }
 
 void* Memory2::LockRegion(uint32_t offset, uint32_t size)
@@ -82,12 +82,8 @@ void Memory2::Unlock(bool flush)
     auto buffer = static_cast<GLES::Buffer*>(mMapBufferInfo.buffer);
     if(!buffer->IsCPUAllocated())
     {
-      // switch to the shared context if necessary
-      auto graphics = mController.GetGraphicsInterface();
-      graphics->ActivateResourceContext();
-
       buffer->Bind(BufferUsage::VERTEX_BUFFER);
-      gl->BufferSubData(GL_ARRAY_BUFFER, mMapBufferInfo.offset, mMapBufferInfo.size, mMappedPointer);
+      gl->BufferSubData(GL_ARRAY_BUFFER, mMapBufferInfo.offset, GLsizeiptr(mMapBufferInfo.size), mMappedPointer);
     }
   }
 
@@ -108,4 +104,4 @@ void Memory2::Flush()
   // TODO:
 }
 
-} // namespace Dali::Graphics::GLES
\ No newline at end of file
+} // namespace Dali::Graphics::GLES