projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[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
4c2e45c
..
f4505d9
100644
(file)
--- 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);
if(!buffer->IsCPUAllocated())
{
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);
}
}
}
}
@@
-104,4
+104,4
@@
void Memory2::Flush()
// TODO:
}
// TODO:
}
-} // namespace Dali::Graphics::GLES
\ No newline at end of file
+} // namespace Dali::Graphics::GLES