From 02f5385eafe112b08fe0b4cddddbf23a7527081c Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 31 Dec 2012 11:30:19 +0100 Subject: [PATCH] Buffer::Unmap no longer return boolean Made no sense: What do you want to do when your buffer doesn't unmap ? Tt now throw a warning by itself in case of failure Former-commit-id: f776af16787316bbe1d55686a1db2c2e0f79d210 --- include/Nazara/Utility/Buffer.hpp | 2 +- src/Nazara/Utility/Buffer.cpp | 13 +++++-------- src/Nazara/Utility/KeyframeMesh.cpp | 2 +- src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp | 6 ++---- src/Nazara/Utility/SkeletalMesh.cpp | 3 +-- src/Nazara/Utility/StaticMesh.cpp | 3 +-- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/include/Nazara/Utility/Buffer.hpp b/include/Nazara/Utility/Buffer.hpp index 553c0e142..d1b2bccf9 100644 --- a/include/Nazara/Utility/Buffer.hpp +++ b/include/Nazara/Utility/Buffer.hpp @@ -50,7 +50,7 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable bool SetStorage(nzBufferStorage storage); - bool Unmap() const; + void Unmap() const; static bool IsSupported(nzBufferStorage storage); static void SetBufferFunction(nzBufferStorage storage, BufferFunction func); diff --git a/src/Nazara/Utility/Buffer.cpp b/src/Nazara/Utility/Buffer.cpp index f927695e3..24183eda3 100644 --- a/src/Nazara/Utility/Buffer.cpp +++ b/src/Nazara/Utility/Buffer.cpp @@ -293,9 +293,7 @@ bool NzBuffer::SetStorage(nzBufferStorage storage) { NazaraError("Failed to create buffer"); delete impl; - - if (!m_impl->Unmap()) - NazaraWarning("Failed to unmap buffer"); + m_impl->Unmap(); return false; } @@ -305,9 +303,7 @@ bool NzBuffer::SetStorage(nzBufferStorage storage) NazaraError("Failed to fill buffer"); impl->Destroy(); delete impl; - - if (!m_impl->Unmap()) - NazaraWarning("Failed to unmap buffer"); + m_impl->Unmap(); return false; } @@ -322,7 +318,7 @@ bool NzBuffer::SetStorage(nzBufferStorage storage) return true; } -bool NzBuffer::Unmap() const +void NzBuffer::Unmap() const { #if NAZARA_UTILITY_SAFE if (!m_impl) @@ -332,7 +328,8 @@ bool NzBuffer::Unmap() const } #endif - return m_impl->Unmap(); + if (!m_impl->Unmap()) + NazaraWarning("Failed to unmap buffer (it's content is undefined)"); ///TODO: Unexpected ? } bool NzBuffer::IsSupported(nzBufferStorage storage) diff --git a/src/Nazara/Utility/KeyframeMesh.cpp b/src/Nazara/Utility/KeyframeMesh.cpp index 9360b5b5a..a2aa0d8ac 100644 --- a/src/Nazara/Utility/KeyframeMesh.cpp +++ b/src/Nazara/Utility/KeyframeMesh.cpp @@ -371,7 +371,7 @@ void NzKeyframeMesh::InterpolateImpl(unsigned int frameA, unsigned int frameB, f NzMeshVertex* vertex = reinterpret_cast(m_impl->vertexBuffer->Map(nzBufferAccess_DiscardAndWrite)); if (!vertex) { - NazaraError("Failed to lock vertex buffer"); + NazaraError("Failed to map vertex buffer"); return; } diff --git a/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp b/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp index 3e1570280..1905ea306 100644 --- a/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp +++ b/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp @@ -227,8 +227,7 @@ bool NzMD5MeshParser::Parse(NzMesh* mesh) } } - if (!indexBuffer->Unmap()) - NazaraWarning("Failed to unmap index buffer"); + indexBuffer->Unmap(); std::unique_ptr vertexBuffer(new NzVertexBuffer(NzMesh::GetDeclaration(), vertexCount, m_parameters.storage, nzBufferUsage_Dynamic)); @@ -399,8 +398,7 @@ bool NzMD5MeshParser::Parse(NzMesh* mesh) vertex++; } - if (!vertexBuffer->Unmap()) - NazaraWarning("Failed to unmap vertex buffer"); + vertexBuffer->Unmap(); // Submesh std::unique_ptr subMesh(new NzStaticMesh(mesh)); diff --git a/src/Nazara/Utility/SkeletalMesh.cpp b/src/Nazara/Utility/SkeletalMesh.cpp index f3f5099c1..4884f89fe 100644 --- a/src/Nazara/Utility/SkeletalMesh.cpp +++ b/src/Nazara/Utility/SkeletalMesh.cpp @@ -314,8 +314,7 @@ void NzSkeletalMesh::Skin(const NzSkeleton* skeleton) const outputVertex++; } - if (!m_impl->vertexBuffer->Unmap()) - NazaraWarning("Failed to unmap vertex buffer"); + m_impl->vertexBuffer->Unmap(); m_impl->aabb = skeleton->GetAABB(); } diff --git a/src/Nazara/Utility/StaticMesh.cpp b/src/Nazara/Utility/StaticMesh.cpp index bccd852e8..c3cdea0ba 100644 --- a/src/Nazara/Utility/StaticMesh.cpp +++ b/src/Nazara/Utility/StaticMesh.cpp @@ -79,8 +79,7 @@ bool NzStaticMesh::GenerateAABB() vertex++; } - if (!m_vertexBuffer->Unmap()) - NazaraWarning("Failed to unmap vertex buffer"); + m_vertexBuffer->Unmap(); return true; }