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
This commit is contained in:
parent
c65f0e9f7e
commit
02f5385eaf
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -371,7 +371,7 @@ void NzKeyframeMesh::InterpolateImpl(unsigned int frameA, unsigned int frameB, f
|
|||
NzMeshVertex* vertex = reinterpret_cast<NzMeshVertex*>(m_impl->vertexBuffer->Map(nzBufferAccess_DiscardAndWrite));
|
||||
if (!vertex)
|
||||
{
|
||||
NazaraError("Failed to lock vertex buffer");
|
||||
NazaraError("Failed to map vertex buffer");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -227,8 +227,7 @@ bool NzMD5MeshParser::Parse(NzMesh* mesh)
|
|||
}
|
||||
}
|
||||
|
||||
if (!indexBuffer->Unmap())
|
||||
NazaraWarning("Failed to unmap index buffer");
|
||||
indexBuffer->Unmap();
|
||||
|
||||
std::unique_ptr<NzVertexBuffer> 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<NzStaticMesh> subMesh(new NzStaticMesh(mesh));
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,8 +79,7 @@ bool NzStaticMesh::GenerateAABB()
|
|||
vertex++;
|
||||
}
|
||||
|
||||
if (!m_vertexBuffer->Unmap())
|
||||
NazaraWarning("Failed to unmap vertex buffer");
|
||||
m_vertexBuffer->Unmap();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue