From d560975e096f9d1e35439c470a29d465c384e402 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 4 Jan 2015 18:23:06 +0100 Subject: [PATCH] Renamed (Set)BufferFunction to (Set)BufferFactory Former-commit-id: 6165dcd881716461a9886be6ce7fd6bb2b335ef0 --- include/Nazara/Utility/Buffer.hpp | 6 +++--- src/Nazara/Renderer/Renderer.cpp | 5 ++++- src/Nazara/Utility/Buffer.cpp | 23 +++++++++++------------ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/include/Nazara/Utility/Buffer.hpp b/include/Nazara/Utility/Buffer.hpp index a41e65e98..1a24e4d9a 100644 --- a/include/Nazara/Utility/Buffer.hpp +++ b/include/Nazara/Utility/Buffer.hpp @@ -25,7 +25,7 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable friend class NzUtility; public: - using BufferFunction = NzAbstractBuffer* (*)(NzBuffer* parent, nzBufferType type); + using BufferFactory = NzAbstractBuffer* (*)(NzBuffer* parent, nzBufferType type); NzBuffer(nzBufferType type); NzBuffer(nzBufferType type, unsigned int size, nzDataStorage storage = nzDataStorage_Software, nzBufferUsage usage = nzBufferUsage_Static); @@ -55,7 +55,7 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable void Unmap() const; static bool IsSupported(nzDataStorage storage); - static void SetBufferFunction(nzDataStorage storage, BufferFunction func); + static void SetBufferFactory(nzDataStorage storage, BufferFactory func); private: static bool Initialize(); @@ -67,7 +67,7 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable NzAbstractBuffer* m_impl; unsigned int m_size; - static BufferFunction s_bufferFunctions[nzDataStorage_Max+1]; + static BufferFactory s_bufferFactories[nzDataStorage_Max+1]; }; #endif // NAZARA_BUFFER_HPP diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp index c96b1de9c..9243f02a0 100644 --- a/src/Nazara/Renderer/Renderer.cpp +++ b/src/Nazara/Renderer/Renderer.cpp @@ -692,7 +692,10 @@ bool NzRenderer::Initialize() return false; } - NzBuffer::SetBufferFunction(nzDataStorage_Hardware, [](NzBuffer* parent, nzBufferType type) -> NzAbstractBuffer* { return new NzHardwareBuffer(parent, type); } ); + NzBuffer::SetBufferFactory(nzDataStorage_Hardware, [](NzBuffer* parent, nzBufferType type) -> NzAbstractBuffer* + { + return new NzHardwareBuffer(parent, type); + }); for (unsigned int i = 0; i <= nzMatrixType_Max; ++i) { diff --git a/src/Nazara/Utility/Buffer.cpp b/src/Nazara/Utility/Buffer.cpp index 5fd1764b9..e05a15db2 100644 --- a/src/Nazara/Utility/Buffer.cpp +++ b/src/Nazara/Utility/Buffer.cpp @@ -16,7 +16,7 @@ namespace { - NzAbstractBuffer* SoftwareBufferFunction(NzBuffer* parent, nzBufferType type) + NzAbstractBuffer* SoftwareBufferFactory(NzBuffer* parent, nzBufferType type) { return new NzSoftwareBuffer(parent, type); } @@ -59,7 +59,6 @@ bool NzBuffer::CopyContent(const NzBuffer& buffer) #endif NzBufferMapper mapper(buffer, nzBufferAccess_ReadOnly); - return Fill(mapper.GetPointer(), 0, buffer.GetSize()); } @@ -68,13 +67,13 @@ bool NzBuffer::Create(unsigned int size, nzDataStorage storage, nzBufferUsage us Destroy(); // Notre buffer est-il supporté ? - if (!s_bufferFunctions[storage]) + if (!IsSupported(storage)) { NazaraError("Buffer storage not supported"); return false; } - std::unique_ptr impl(s_bufferFunctions[storage](this, m_type)); + std::unique_ptr impl(s_bufferFactories[storage](this, m_type)); if (!impl->Create(size, usage)) { NazaraError("Failed to create buffer"); @@ -228,7 +227,7 @@ bool NzBuffer::SetStorage(nzDataStorage storage) return false; } - NzAbstractBuffer* impl = s_bufferFunctions[storage](this, m_type); + NzAbstractBuffer* impl = s_bufferFactories[storage](this, m_type); if (!impl->Create(m_size, m_usage)) { NazaraError("Failed to create buffer"); @@ -269,29 +268,29 @@ void NzBuffer::Unmap() const #endif if (!m_impl->Unmap()) - NazaraWarning("Failed to unmap buffer (it's content is undefined)"); ///TODO: Unexpected ? + NazaraWarning("Failed to unmap buffer (it's content may be undefined)"); ///TODO: Unexpected ? } bool NzBuffer::IsSupported(nzDataStorage storage) { - return s_bufferFunctions[storage] != nullptr; + return s_bufferFactories[storage] != nullptr; } -void NzBuffer::SetBufferFunction(nzDataStorage storage, BufferFunction func) +void NzBuffer::SetBufferFactory(nzDataStorage storage, BufferFactory func) { - s_bufferFunctions[storage] = func; + s_bufferFactories[storage] = func; } bool NzBuffer::Initialize() { - s_bufferFunctions[nzDataStorage_Software] = SoftwareBufferFunction; + s_bufferFactories[nzDataStorage_Software] = SoftwareBufferFactory; return true; } void NzBuffer::Uninitialize() { - std::memset(s_bufferFunctions, 0, (nzDataStorage_Max+1)*sizeof(NzBuffer::BufferFunction)); + std::memset(s_bufferFactories, 0, (nzDataStorage_Max+1)*sizeof(NzBuffer::BufferFactory)); } -NzBuffer::BufferFunction NzBuffer::s_bufferFunctions[nzDataStorage_Max+1] = {0}; +NzBuffer::BufferFactory NzBuffer::s_bufferFactories[nzDataStorage_Max+1] = {0};