Fixed last commit

Former-commit-id: 5034392dbdab232be71f8537638ed75c1c81eab8
This commit is contained in:
Lynix 2013-01-02 13:41:26 +01:00
parent 02f5385eaf
commit 520643140c
7 changed files with 12 additions and 16 deletions

View File

@ -37,7 +37,7 @@ class NAZARA_API NzIndexBuffer : public NzResource
bool SetStorage(nzBufferStorage storage);
bool Unmap() const;
void Unmap() const;
private:
NzBuffer* m_buffer;

View File

@ -37,7 +37,7 @@ class NAZARA_API NzVertexBuffer : public NzResource
bool SetStorage(nzBufferStorage storage);
bool Unmap() const;
void Unmap() const;
private:
NzBuffer* m_buffer;

View File

@ -122,8 +122,7 @@ void NzDebugDrawer::Draw(const NzCubef& cube)
vertex->position.Set(max.x, min.y, max.z);
vertex++;
if (!vertexBuffer->Unmap())
NazaraWarning("Failed to unmap buffer");
vertexBuffer->Unmap();
const NzShader* oldShader = NzRenderer::GetShader();
@ -199,8 +198,7 @@ void NzDebugDrawer::Draw(const NzSkeleton* skeleton)
}
}
if (!vertexBuffer->Unmap())
NazaraWarning("Failed to unmap buffer");
vertexBuffer->Unmap();
if (vertexCount > 0)
{

View File

@ -78,8 +78,7 @@ bool NzBuffer::CopyContent(NzBuffer& buffer)
bool r = Fill(ptr, 0, buffer.GetLength());
if (!buffer.Unmap())
NazaraWarning("Failed to unmap source buffer");
buffer.Unmap();
return r;
}
@ -324,7 +323,7 @@ void NzBuffer::Unmap() const
if (!m_impl)
{
NazaraError("Buffer not valid");
return false;
return;
}
#endif

View File

@ -217,15 +217,15 @@ bool NzIndexBuffer::SetStorage(nzBufferStorage storage)
return m_buffer->SetStorage(storage);
}
bool NzIndexBuffer::Unmap() const
void NzIndexBuffer::Unmap() const
{
#if NAZARA_UTILITY_SAFE
if (!m_buffer)
{
NazaraError("Impossible to unlock sequential buffers");
return false;
return;
}
#endif
return m_buffer->Unmap();
m_buffer->Unmap();
}

View File

@ -357,8 +357,7 @@ bool NzMD5MeshParser::Parse(NzMesh* mesh)
}
}
if (!indexBuffer->Unmap())
NazaraWarning("Failed to unmap index buffer");
indexBuffer->Unmap();
// Vertex buffer
std::unique_ptr<NzVertexBuffer> vertexBuffer(new NzVertexBuffer(NzMesh::GetDeclaration(), vertexCount, m_parameters.storage, nzBufferUsage_Dynamic));

View File

@ -169,7 +169,7 @@ bool NzVertexBuffer::SetStorage(nzBufferStorage storage)
return m_buffer->SetStorage(storage);
}
bool NzVertexBuffer::Unmap() const
void NzVertexBuffer::Unmap() const
{
return m_buffer->Unmap();
m_buffer->Unmap();
}