diff --git a/MobileGL/MG_State/GLState/BufferState/BufferObject.h b/MobileGL/MG_State/GLState/BufferState/BufferObject.h index e82a0873..e1e894bd 100644 --- a/MobileGL/MG_State/GLState/BufferState/BufferObject.h +++ b/MobileGL/MG_State/GLState/BufferState/BufferObject.h @@ -71,8 +71,8 @@ namespace MobileGL { SizeT GetSize() const; BufferUsage GetUsage() const; Range1D GetDirtyRange() const; - void* AquireMemory(Bool markMapped, Bool read, Bool write); - void* AquireMemoryRange(Range1D range, BufferMappingAccessBit access); + void* AcquireMemory(Bool markMapped, Bool read, Bool write); + void* AcquireMemoryRange(Range1D range, BufferMappingAccessBit access); Bool IsMapped() const; private: diff --git a/MobileGL/MG_State/GLState/BufferState/BufferState.cpp b/MobileGL/MG_State/GLState/BufferState/BufferState.cpp index 4b874f6b..325098c8 100644 --- a/MobileGL/MG_State/GLState/BufferState/BufferState.cpp +++ b/MobileGL/MG_State/GLState/BufferState/BufferState.cpp @@ -8,10 +8,10 @@ namespace MobileGL { m_size = data.size; memcpy(m_data.data(), data.data, data.size); m_dirtyRange = MakeUnique(0, m_size); - m_dirtyRange->Extend(0, m_size); + m_dirtyRange->UnionUpdate(0, m_size); } - void* BufferObject::AquireMemory(Bool markMapped, Bool read, Bool write) { + void* BufferObject::AcquireMemory(Bool markMapped, Bool read, Bool write) { if (markMapped) { m_isMapped = true; m_mappingAccess = (read ? BufferMappingAccessBit::Read : BufferMappingAccessBit::Null) | @@ -20,7 +20,7 @@ namespace MobileGL { return m_data.data(); } - void* BufferObject::AquireMemoryRange(Range1D range, BufferMappingAccessBit access) { + void* BufferObject::AcquireMemoryRange(Range1D range, BufferMappingAccessBit access) { m_isMapped = true; m_mappingAccess = access; return m_data.data() + range.start; diff --git a/MobileGL/MG_Util/Types.h b/MobileGL/MG_Util/Types.h index c7815910..9824d848 100644 --- a/MobileGL/MG_Util/Types.h +++ b/MobileGL/MG_Util/Types.h @@ -84,7 +84,7 @@ namespace MobileGL { } } - void Extend(SizeT newStart, SizeT newEnd) { + void UnionUpdate(SizeT newStart, SizeT newEnd) { if (newStart < minStart || newEnd > maxEnd) { throw RuntimeError("Range exceeds bounds"); }