From 41feedfa5f76ac8fd159a777021654416cfff3c6 Mon Sep 17 00:00:00 2001 From: Eunki Hong Date: Thu, 16 Sep 2021 02:15:02 -0700 Subject: [PATCH] Fix SVACE issue at gles2-graphics-memory casting between uint32_t --> long Change-Id: Id82517274fe3689c6139ada519b611397cbf3c8b Signed-off-by: Eunki Hong --- dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp | 2 +- dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp b/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp index f4505d9..038410a 100644 --- a/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp +++ b/dali/internal/graphics/gles-impl/gles2-graphics-memory.cpp @@ -83,7 +83,7 @@ void Memory2::Unlock(bool flush) if(!buffer->IsCPUAllocated()) { buffer->Bind(BufferUsage::VERTEX_BUFFER); - gl->BufferSubData(GL_ARRAY_BUFFER, mMapBufferInfo.offset, GLsizeiptr(mMapBufferInfo.size), mMappedPointer); + gl->BufferSubData(GL_ARRAY_BUFFER, GLintptr(mMapBufferInfo.offset), GLsizeiptr(mMapBufferInfo.size), mMappedPointer); } } diff --git a/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp b/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp index c2864c1..102d5e1 100644 --- a/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp +++ b/dali/internal/graphics/gles-impl/gles3-graphics-memory.cpp @@ -65,7 +65,7 @@ void* Memory3::LockRegion(uint32_t offset, uint32_t size) // @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, GLsizeiptr(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; -- 2.7.4