X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fgraphics%2Fgles-impl%2Fgles2-graphics-memory.cpp;h=038410ae0ae818b9b9ee66a2b932634f01afa02d;hb=84f363ed84333948d97bac0b43809554c16c07d0;hp=f92af3241a06eced4144901da0edfb64180d44dc;hpb=d9f880093fa614382669806084826641657a39b2;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp b/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp
index f92af32..038410a 100644
--- a/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp
+++ b/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp
@@ -23,6 +23,7 @@
 #include <dali/integration-api/gl-defines.h>
 
 // INTERNAL INCLUDES
+#include <dali/internal/graphics/common/graphics-interface.h>
 #include "egl-graphics-controller.h"
 #include "gles-graphics-buffer.h"
 
@@ -44,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)
@@ -56,14 +57,14 @@ void* Memory2::LockRegion(uint32_t offset, uint32_t size)
     auto buffer = static_cast<GLES::Buffer*>(mMapBufferInfo.buffer);
     if(buffer->IsCPUAllocated())
     {
-      using Ptr = char*;
-      mMappedPointer = Ptr(buffer->GetCPUAllocatedAddress()) + offset;
+      using Ptr           = char*;
+      mMappedPointer      = Ptr(buffer->GetCPUAllocatedAddress()) + offset;
       mIsAllocatedLocally = false;
     }
     else
     {
-      auto retval    = malloc(size);
-      mMappedPointer = retval;
+      auto retval         = malloc(size);
+      mMappedPointer      = retval;
       mIsAllocatedLocally = true;
     }
   }
@@ -76,13 +77,13 @@ void Memory2::Unlock(bool flush)
   auto gl = mController.GetGL();
 
   // for buffer...
-  if(mMapObjectType == MapObjectType::BUFFER&& mMappedPointer)
+  if(mMapObjectType == MapObjectType::BUFFER && mMappedPointer)
   {
     auto buffer = static_cast<GLES::Buffer*>(mMapBufferInfo.buffer);
     if(!buffer->IsCPUAllocated())
     {
       buffer->Bind(BufferUsage::VERTEX_BUFFER);
-      gl->BufferSubData(GL_ARRAY_BUFFER, mMapBufferInfo.offset, mMapBufferInfo.size, mMappedPointer);
+      gl->BufferSubData(GL_ARRAY_BUFFER, GLintptr(mMapBufferInfo.offset), GLsizeiptr(mMapBufferInfo.size), mMappedPointer);
     }
   }
 
@@ -103,4 +104,4 @@ void Memory2::Flush()
   // TODO:
 }
 
-} // namespace Dali::Graphics::GLES
\ No newline at end of file
+} // namespace Dali::Graphics::GLES