From 1e5c34d53a8a5e5c8a748f45fd8450663f979447 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 3 Jan 2013 03:50:18 +0100 Subject: [PATCH] Constant buffer mapping returns non-const pointer Former-commit-id: 37438d554d8733350fcecbbfc4ba0dad46256f73 --- include/Nazara/Utility/Buffer.hpp | 2 +- include/Nazara/Utility/IndexBuffer.hpp | 2 +- include/Nazara/Utility/VertexBuffer.hpp | 2 +- src/Nazara/Utility/Buffer.cpp | 2 +- src/Nazara/Utility/IndexBuffer.cpp | 2 +- src/Nazara/Utility/VertexBuffer.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/Nazara/Utility/Buffer.hpp b/include/Nazara/Utility/Buffer.hpp index d1b2bccf9..66a0cdfe6 100644 --- a/include/Nazara/Utility/Buffer.hpp +++ b/include/Nazara/Utility/Buffer.hpp @@ -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); diff --git a/include/Nazara/Utility/IndexBuffer.hpp b/include/Nazara/Utility/IndexBuffer.hpp index 4a2d6e95f..b58859cca 100644 --- a/include/Nazara/Utility/IndexBuffer.hpp +++ b/include/Nazara/Utility/IndexBuffer.hpp @@ -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); diff --git a/include/Nazara/Utility/VertexBuffer.hpp b/include/Nazara/Utility/VertexBuffer.hpp index 4b47e8849..db5170b8e 100644 --- a/include/Nazara/Utility/VertexBuffer.hpp +++ b/include/Nazara/Utility/VertexBuffer.hpp @@ -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); diff --git a/src/Nazara/Utility/Buffer.cpp b/src/Nazara/Utility/Buffer.cpp index 563160730..b0ab50086 100644 --- a/src/Nazara/Utility/Buffer.cpp +++ b/src/Nazara/Utility/Buffer.cpp @@ -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) diff --git a/src/Nazara/Utility/IndexBuffer.cpp b/src/Nazara/Utility/IndexBuffer.cpp index a6efdb0dc..5eeb30648 100644 --- a/src/Nazara/Utility/IndexBuffer.cpp +++ b/src/Nazara/Utility/IndexBuffer.cpp @@ -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) diff --git a/src/Nazara/Utility/VertexBuffer.cpp b/src/Nazara/Utility/VertexBuffer.cpp index 5fe33a5cb..f77a54f73 100644 --- a/src/Nazara/Utility/VertexBuffer.cpp +++ b/src/Nazara/Utility/VertexBuffer.cpp @@ -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)