X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fgraphics%2Fgles-impl%2Fgles3-graphics-memory.cpp;h=102d5e18058497fdf2b9b54c5b9fcf9c08b6a75e;hb=84f363ed84333948d97bac0b43809554c16c07d0;hp=3fb5da4db2a405dbf1b3b1022a57f0b6a9187485;hpb=9a9ab95ca063cc2cbfddc0d249e441f8bf7845c2;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp b/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp index 3fb5da4..102d5e1 100644 --- a/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp +++ b/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp @@ -57,15 +57,15 @@ void* Memory3::LockRegion(uint32_t offset, uint32_t size) if(buffer->IsCPUAllocated()) { - using Ptr = char*; - return Ptr(buffer->GetCPUAllocatedAddress()) + offset; + using Ptr = char*; + mMappedPointer = Ptr(buffer->GetCPUAllocatedAddress()) + offset; } else { // @TODO: trashing vertex binding, better find target that is rarely used buffer->Bind(Graphics::BufferUsage::VERTEX_BUFFER); void* ptr = nullptr; - ptr = gl->MapBufferRange(GL_ARRAY_BUFFER, mMapBufferInfo.offset, mMapBufferInfo.size, GL_MAP_WRITE_BIT); + ptr = gl->MapBufferRange(GL_ARRAY_BUFFER, GLintptr(mMapBufferInfo.offset), GLsizeiptr(mMapBufferInfo.size), GL_MAP_WRITE_BIT); mMappedPointer = ptr; } return mMappedPointer; @@ -92,6 +92,8 @@ void Memory3::Unlock(bool flush) { Flush(); } + + mMappedPointer = nullptr; } void Memory3::Flush() @@ -99,4 +101,4 @@ void Memory3::Flush() // TODO: } -} // namespace Dali::Graphics::GLES \ No newline at end of file +} // namespace Dali::Graphics::GLES