sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Constant buffer mapping returns non-const pointer 

Former-commit-id: 37438d554d8733350fcecbbfc4ba0dad46256f73
This commit is contained in:
Lynix 2013-01-03 03:50:18 +01:00
parent 27dcd15d26
commit 1e5c34d53a
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Utility/Buffer.hpp
View File

@ -46,7 +46,7 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable
bool IsValid() const;
void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0);
const void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0) const;
void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0) const;
bool SetStorage(nzBufferStorage storage);

2
include/Nazara/Utility/IndexBuffer.hpp
View File

@ -33,7 +33,7 @@ class NAZARA_API NzIndexBuffer : public NzResource
bool IsSequential() const;
void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0);
const void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0) const;
void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0) const;
bool SetStorage(nzBufferStorage storage);

2
include/Nazara/Utility/VertexBuffer.hpp
View File

@ -33,7 +33,7 @@ class NAZARA_API NzVertexBuffer : public NzResource
bool IsHardware() const;
void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0);
const void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0) const;
void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0) const;
bool SetStorage(nzBufferStorage storage);

2
src/Nazara/Utility/Buffer.cpp
View File

@ -234,7 +234,7 @@ void* NzBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned int len
return m_impl->Map(access, offset*m_typeSize, ((length == 0) ? m_length-offset : length)*m_typeSize);
}
const void* NzBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned int length) const
void* NzBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned int length) const
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)

2
src/Nazara/Utility/IndexBuffer.cpp
View File

@ -185,7 +185,7 @@ void* NzIndexBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned in
return m_buffer->Map(access, m_startIndex+offset, (length) ? length : m_indexCount-offset);
}
const void* NzIndexBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned int length) const
void* NzIndexBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned int length) const
{
#if NAZARA_UTILITY_SAFE
if (!m_buffer)

2
src/Nazara/Utility/VertexBuffer.cpp
View File

@ -151,7 +151,7 @@ void* NzVertexBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned i
return m_buffer->Map(access, m_startVertex+offset, (length) ? length : m_vertexCount-offset);
}
const void* NzVertexBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned int length) const
void* NzVertexBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned int length) const
{
#if NAZARA_UTILITY_SAFE
if (offset+length > m_vertexCount)