sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed BufferStorage enum to DataStorage 

Former-commit-id: 97eede03eb6bb85e506c640d40c9d6e7acb2e099
This commit is contained in:
Lynix 2015-01-04 18:16:31 +01:00
parent 8a836b2060
commit b3d72ec094
15 changed files with 65 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/codeblocks/CppCheckResults.xml Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<results>
<error file="..\..\include\Nazara\Prerequesites.hpp" line="29" id="preprocessorErrorDirective" severity="error" msg="#error" />
<error file="..\..\include\Nazara\Renderer\RenderStates.inl" line="8" id="uninitMemberVar" severity="style" msg="Member variable &apos;NzRenderStates::backFace&apos; is not initialized in the constructor." />
<error file="..\..\include\Nazara\Renderer\RenderStates.inl" line="8" id="uninitMemberVar" severity="style" msg="Member variable &apos;NzRenderStates::frontFace&apos; is not initialized in the constructor." />
<error file="..\..\include\Nazara\Utility\MeshData.hpp" line="17" id="unusedStructMember" severity="style" msg="struct or union member &apos;NzMeshData::primitiveMode&apos; is never used." />
<error file="..\..\src\Nazara\Utility\Loaders\DDS\Constants.hpp" line="15" id="unusedFunction" severity="style" msg="The function &apos;FourCC&apos; is never used." />
<error file="..\..\src\Nazara\Core\Win32\MutexImpl.cpp" line="22" id="unusedFunction" severity="style" msg="The function &apos;Lock&apos; is never used." />
<error file="..\..\include\Nazara\Core\Endianness.inl" line="8" id="unusedFunction" severity="style" msg="The function &apos;NzByteSwap&apos; is never used." />
<error file="..\..\src\Nazara\Core\Win32\Time.cpp" line="8" id="unusedFunction" severity="style" msg="The function &apos;NzFileTimeToTime&apos; is never used." />
<error file="..\..\include\Nazara\Core\Endianness.inl" line="18" id="unusedFunction" severity="style" msg="The function &apos;NzGetPlatformEndianness&apos; is never used." />
<error file="..\..\src\Nazara\Core\Win32\MutexImpl.cpp" line="27" id="unusedFunction" severity="style" msg="The function &apos;TryLock&apos; is never used." />
<error file="..\..\src\Nazara\Core\Win32\MutexImpl.cpp" line="32" id="unusedFunction" severity="style" msg="The function &apos;Unlock&apos; is never used." />
<error id="missingIncludeSystem" severity="style" msg="Cppcheck cannot find all the include files. Cppcheck can check the code without the include files found. But the results will probably be more accurate if all the include files are found. Please check your project&apos;s include directories and add all of them as include directories for Cppcheck. To see what files Cppcheck cannot find use --check-config." />
</results>

16
include/Nazara/Utility/Buffer.hpp
View File

@ -28,19 +28,19 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable
using BufferFunction = NzAbstractBuffer* (*)(NzBuffer* parent, nzBufferType type);
NzBuffer(nzBufferType type);
NzBuffer(nzBufferType type, unsigned int size, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
NzBuffer(nzBufferType type, unsigned int size, nzDataStorage storage = nzDataStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
~NzBuffer();
bool CopyContent(const NzBuffer& buffer);
bool Create(unsigned int size, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
bool Create(unsigned int size, nzDataStorage storage = nzDataStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
void Destroy();
bool Fill(const void* data, unsigned int offset, unsigned int size, bool forceDiscard = false);
NzAbstractBuffer* GetImpl() const;
unsigned int GetSize() const;
nzBufferStorage GetStorage() const;
nzDataStorage GetStorage() const;
nzBufferType GetType() const;
nzBufferUsage GetUsage() const;
@ -50,24 +50,24 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable
void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int size = 0);
void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int size = 0) const;
bool SetStorage(nzBufferStorage storage);
bool SetStorage(nzDataStorage storage);
void Unmap() const;
static bool IsSupported(nzBufferStorage storage);
static void SetBufferFunction(nzBufferStorage storage, BufferFunction func);
static bool IsSupported(nzDataStorage storage);
static void SetBufferFunction(nzDataStorage storage, BufferFunction func);
private:
static bool Initialize();
static void Uninitialize();
nzBufferStorage m_storage;
nzBufferType m_type;
nzBufferUsage m_usage;
nzDataStorage m_storage;
NzAbstractBuffer* m_impl;
unsigned int m_size;
static BufferFunction s_bufferFunctions[nzBufferStorage_Max+1];
static BufferFunction s_bufferFunctions[nzDataStorage_Max+1];
};
#endif // NAZARA_BUFFER_HPP

18
include/Nazara/Utility/Enums.hpp
View File

@ -25,15 +25,6 @@ enum nzBufferAccess
nzBufferAccess_Max = nzBufferAccess_WriteOnly
};
enum nzBufferStorage
{
//nzBufferStorage_Both, ///TODO
nzBufferStorage_Hardware,
nzBufferStorage_Software,
nzBufferStorage_Max = nzBufferStorage_Software
};
enum nzBufferType
{
nzBufferType_Index,
@ -84,6 +75,15 @@ enum nzCubemapFace
nzCubemapFace_Max = nzCubemapFace_NegativeZ
};
enum nzDataStorage
{
nzDataStorage_Both,
nzDataStorage_Hardware,
nzDataStorage_Software,
nzDataStorage_Max = nzDataStorage_Software
};
enum nzEventType
{
nzEventType_GainedFocus,

6
include/Nazara/Utility/IndexBuffer.hpp
View File

@ -23,7 +23,7 @@ class NAZARA_API NzIndexBuffer : public NzResource
NzIndexBuffer() = default;
NzIndexBuffer(bool largeIndices, NzBuffer* buffer);
NzIndexBuffer(bool largeIndices, NzBuffer* buffer, unsigned int startOffset, unsigned int endOffset);
NzIndexBuffer(bool largeIndices, unsigned int length, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
NzIndexBuffer(bool largeIndices, unsigned int length, nzDataStorage storage = nzDataStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
NzIndexBuffer(const NzIndexBuffer& indexBuffer);
NzIndexBuffer(NzIndexBuffer&& indexBuffer) noexcept;
~NzIndexBuffer();
@ -54,11 +54,11 @@ class NAZARA_API NzIndexBuffer : public NzResource
void Reset();
void Reset(bool largeIndices, NzBuffer* buffer);
void Reset(bool largeIndices, NzBuffer* buffer, unsigned int startOffset, unsigned int endOffset);
void Reset(bool largeIndices, unsigned int length, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
void Reset(bool largeIndices, unsigned int length, nzDataStorage storage = nzDataStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
void Reset(const NzIndexBuffer& indexBuffer);
void Reset(NzIndexBuffer&& indexBuffer) noexcept;
bool SetStorage(nzBufferStorage storage);
bool SetStorage(nzDataStorage storage);
void Unmap() const;

2
include/Nazara/Utility/Mesh.hpp
View File

@ -25,7 +25,7 @@ struct NAZARA_API NzMeshParams
NzMeshParams(); // Vérifie que le storage par défaut est supporté (software autrement)
// Si ceci sera le stockage utilisé par les buffers
nzBufferStorage storage = nzBufferStorage_Hardware;
nzDataStorage storage = nzDataStorage_Hardware;
// La mise à l'échelle éventuelle que subira le mesh
NzVector3f scale = NzVector3f::Unit();

6
include/Nazara/Utility/VertexBuffer.hpp
View File

@ -24,7 +24,7 @@ class NAZARA_API NzVertexBuffer : public NzResource
NzVertexBuffer() = default;
NzVertexBuffer(const NzVertexDeclaration* vertexDeclaration, NzBuffer* buffer);
NzVertexBuffer(const NzVertexDeclaration* vertexDeclaration, NzBuffer* buffer, unsigned int startOffset, unsigned int endOffset);
NzVertexBuffer(const NzVertexDeclaration* vertexDeclaration, unsigned int length, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
NzVertexBuffer(const NzVertexDeclaration* vertexDeclaration, unsigned int length, nzDataStorage storage = nzDataStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
NzVertexBuffer(const NzVertexBuffer& vertexBuffer);
NzVertexBuffer(NzVertexBuffer&& vertexBuffer) noexcept;
~NzVertexBuffer();
@ -50,11 +50,11 @@ class NAZARA_API NzVertexBuffer : public NzResource
void Reset();
void Reset(const NzVertexDeclaration* vertexDeclaration, NzBuffer* buffer);
void Reset(const NzVertexDeclaration* vertexDeclaration, NzBuffer* buffer, unsigned int startOffset, unsigned int endOffset);
void Reset(const NzVertexDeclaration* vertexDeclaration, unsigned int length, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
void Reset(const NzVertexDeclaration* vertexDeclaration, unsigned int length, nzDataStorage storage = nzDataStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
void Reset(const NzVertexBuffer& vertexBuffer);
void Reset(NzVertexBuffer&& vertexBuffer) noexcept;
bool SetStorage(nzBufferStorage storage);
bool SetStorage(nzDataStorage storage);
void SetVertexDeclaration(const NzVertexDeclaration* vertexDeclaration);
void Unmap() const;

4
src/Nazara/Graphics/ForwardRenderTechnique.cpp
View File

@ -27,7 +27,7 @@ namespace
NzIndexBuffer* BuildIndexBuffer()
{
std::unique_ptr<NzIndexBuffer> indexBuffer(new NzIndexBuffer(false, s_maxSprites*6, nzBufferStorage_Hardware, nzBufferUsage_Static));
std::unique_ptr<NzIndexBuffer> indexBuffer(new NzIndexBuffer(false, s_maxSprites*6, nzDataStorage_Hardware, nzBufferUsage_Static));
indexBuffer->SetPersistent(false);
NzBufferMapper<NzIndexBuffer> mapper(indexBuffer.get(), nzBufferAccess_WriteOnly);
@ -49,7 +49,7 @@ namespace
}
NzForwardRenderTechnique::NzForwardRenderTechnique() :
m_spriteBuffer(NzVertexDeclaration::Get(nzVertexLayout_XYZ_Color_UV), s_maxSprites*4, nzBufferStorage_Hardware, nzBufferUsage_Dynamic),
m_spriteBuffer(NzVertexDeclaration::Get(nzVertexLayout_XYZ_Color_UV), s_maxSprites*4, nzDataStorage_Hardware, nzBufferUsage_Dynamic),
m_maxLightPassPerObject(3)
{
if (!s_indexBuffer)

2
src/Nazara/Graphics/SkinningManager.cpp
View File

@ -174,7 +174,7 @@ NzVertexBuffer* NzSkinningManager::GetBuffer(const NzSkeletalMesh* mesh, const N
{
std::unique_ptr<NzVertexBuffer> vertexBuffer(new NzVertexBuffer);
vertexBuffer->SetPersistent(false);
vertexBuffer->Reset(NzVertexDeclaration::Get(nzVertexLayout_XYZ_Normal_UV_Tangent), mesh->GetVertexCount(), nzBufferStorage_Hardware, nzBufferUsage_Dynamic);
vertexBuffer->Reset(NzVertexDeclaration::Get(nzVertexLayout_XYZ_Normal_UV_Tangent), mesh->GetVertexCount(), nzDataStorage_Hardware, nzBufferUsage_Dynamic);
BufferData data({vertexBuffer.get(), true});
meshMap.insert(std::make_pair(mesh, data));

4
src/Nazara/Graphics/SkyboxBackground.cpp
View File

@ -21,7 +21,7 @@ namespace
{
NzIndexBuffer* BuildIndexBuffer()
{
std::unique_ptr<NzIndexBuffer> indexBuffer(new NzIndexBuffer(false, 36, nzBufferStorage_Hardware, nzBufferUsage_Static));
std::unique_ptr<NzIndexBuffer> indexBuffer(new NzIndexBuffer(false, 36, nzDataStorage_Hardware, nzBufferUsage_Static));
indexBuffer->SetPersistent(false);
nzUInt16 indices[6*6] =
@ -155,7 +155,7 @@ namespace
NzVertexBuffer* BuildVertexBuffer()
{
std::unique_ptr<NzVertexBuffer> vertexBuffer(new NzVertexBuffer(NzVertexDeclaration::Get(nzVertexLayout_XYZ), 8, nzBufferStorage_Hardware, nzBufferUsage_Static));
std::unique_ptr<NzVertexBuffer> vertexBuffer(new NzVertexBuffer(NzVertexDeclaration::Get(nzVertexLayout_XYZ), 8, nzDataStorage_Hardware, nzBufferUsage_Static));
vertexBuffer->SetPersistent(false);
float vertices[8*(sizeof(float)*3)] =

2
src/Nazara/Renderer/DebugDrawer.cpp
View File

@ -667,7 +667,7 @@ bool NzDebugDrawer::Initialize()
try
{
NzErrorFlags flags(nzErrorFlag_ThrowException, true);
s_vertexBuffer.Reset(NzVertexDeclaration::Get(nzVertexLayout_XYZ), 65365, nzBufferStorage_Hardware, nzBufferUsage_Dynamic);
s_vertexBuffer.Reset(NzVertexDeclaration::Get(nzVertexLayout_XYZ), 65365, nzDataStorage_Hardware, nzBufferUsage_Dynamic);
}
catch (const std::exception& e)
{

6
src/Nazara/Renderer/Renderer.cpp
View File

@ -692,7 +692,7 @@ bool NzRenderer::Initialize()
return false;
}
NzBuffer::SetBufferFunction(nzBufferStorage_Hardware, [](NzBuffer* parent, nzBufferType type) -> NzAbstractBuffer* { return new NzHardwareBuffer(parent, type); } );
NzBuffer::SetBufferFunction(nzDataStorage_Hardware, [](NzBuffer* parent, nzBufferType type) -> NzAbstractBuffer* { return new NzHardwareBuffer(parent, type); } );
for (unsigned int i = 0; i <= nzMatrixType_Max; ++i)
{
@ -775,7 +775,7 @@ bool NzRenderer::Initialize()
s_updateFlags = Update_Matrices | Update_Shader | Update_VAO;
s_vertexBuffer = nullptr;
s_fullscreenQuadBuffer.Reset(NzVertexDeclaration::Get(nzVertexLayout_XY), 4, nzBufferStorage_Hardware, nzBufferUsage_Static);
s_fullscreenQuadBuffer.Reset(NzVertexDeclaration::Get(nzVertexLayout_XY), 4, nzDataStorage_Hardware, nzBufferUsage_Static);
float vertices[4*2] =
{
@ -796,7 +796,7 @@ bool NzRenderer::Initialize()
try
{
NzErrorFlags errFlags(nzErrorFlag_ThrowException, true);
s_instanceBuffer.Reset(nullptr, NAZARA_RENDERER_INSTANCE_BUFFER_SIZE, nzBufferStorage_Hardware, nzBufferUsage_Dynamic);
s_instanceBuffer.Reset(nullptr, NAZARA_RENDERER_INSTANCE_BUFFER_SIZE, nzDataStorage_Hardware, nzBufferUsage_Dynamic);
}
catch (const std::exception& e)
{

20
src/Nazara/Utility/Buffer.cpp
View File

@ -29,7 +29,7 @@ m_size(0)
{
}
NzBuffer::NzBuffer(nzBufferType type, unsigned int size, nzBufferStorage storage, nzBufferUsage usage) :
NzBuffer::NzBuffer(nzBufferType type, unsigned int size, nzDataStorage storage, nzBufferUsage usage) :
m_type(type),
m_impl(nullptr)
{
@ -63,7 +63,7 @@ bool NzBuffer::CopyContent(const NzBuffer& buffer)
return Fill(mapper.GetPointer(), 0, buffer.GetSize());
}
bool NzBuffer::Create(unsigned int size, nzBufferStorage storage, nzBufferUsage usage)
bool NzBuffer::Create(unsigned int size, nzDataStorage storage, nzBufferUsage usage)
{
Destroy();
@ -131,7 +131,7 @@ unsigned int NzBuffer::GetSize() const
return m_size;
}
nzBufferStorage NzBuffer::GetStorage() const
nzDataStorage NzBuffer::GetStorage() const
{
return m_storage;
}
@ -148,7 +148,7 @@ nzBufferUsage NzBuffer::GetUsage() const
bool NzBuffer::IsHardware() const
{
return m_storage == nzBufferStorage_Hardware;
return m_storage == nzDataStorage_Hardware;
}
bool NzBuffer::IsValid() const
@ -200,7 +200,7 @@ void* NzBuffer::Map(nzBufferAccess access, unsigned int offset, unsigned int siz
return m_impl->Map(access, offset, (size == 0) ? m_size-offset : size);
}
bool NzBuffer::SetStorage(nzBufferStorage storage)
bool NzBuffer::SetStorage(nzDataStorage storage)
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)
@ -272,26 +272,26 @@ void NzBuffer::Unmap() const
NazaraWarning("Failed to unmap buffer (it's content is undefined)"); ///TODO: Unexpected ?
}
bool NzBuffer::IsSupported(nzBufferStorage storage)
bool NzBuffer::IsSupported(nzDataStorage storage)
{
return s_bufferFunctions[storage] != nullptr;
}
void NzBuffer::SetBufferFunction(nzBufferStorage storage, BufferFunction func)
void NzBuffer::SetBufferFunction(nzDataStorage storage, BufferFunction func)
{
s_bufferFunctions[storage] = func;
}
bool NzBuffer::Initialize()
{
s_bufferFunctions[nzBufferStorage_Software] = SoftwareBufferFunction;
s_bufferFunctions[nzDataStorage_Software] = SoftwareBufferFunction;
return true;
}
void NzBuffer::Uninitialize()
{
std::memset(s_bufferFunctions, 0, (nzBufferStorage_Max+1)*sizeof(NzBuffer::BufferFunction));
std::memset(s_bufferFunctions, 0, (nzDataStorage_Max+1)*sizeof(NzBuffer::BufferFunction));
}
NzBuffer::BufferFunction NzBuffer::s_bufferFunctions[nzBufferStorage_Max+1] = {0};
NzBuffer::BufferFunction NzBuffer::s_bufferFunctions[nzDataStorage_Max+1] = {0};

6
src/Nazara/Utility/IndexBuffer.cpp
View File

@ -24,7 +24,7 @@ NzIndexBuffer::NzIndexBuffer(bool largeIndices, NzBuffer* buffer, unsigned int s
Reset(largeIndices, buffer, startOffset, endOffset);
}
NzIndexBuffer::NzIndexBuffer(bool largeIndices, unsigned int length, nzBufferStorage storage, nzBufferUsage usage)
NzIndexBuffer::NzIndexBuffer(bool largeIndices, unsigned int length, nzDataStorage storage, nzBufferUsage usage)
{
NzErrorFlags(nzErrorFlag_ThrowException, true);
Reset(largeIndices, length, storage, usage);
@ -220,7 +220,7 @@ void NzIndexBuffer::Reset(bool largeIndices, NzBuffer* buffer, unsigned int star
m_startOffset = startOffset;
}
void NzIndexBuffer::Reset(bool largeIndices, unsigned int length, nzBufferStorage storage, nzBufferUsage usage)
void NzIndexBuffer::Reset(bool largeIndices, unsigned int length, nzDataStorage storage, nzBufferUsage usage)
{
unsigned int stride = (largeIndices) ? sizeof(nzUInt32) : sizeof(nzUInt16);
@ -251,7 +251,7 @@ void NzIndexBuffer::Reset(NzIndexBuffer&& indexBuffer) noexcept
m_startOffset = indexBuffer.m_startOffset;
}
bool NzIndexBuffer::SetStorage(nzBufferStorage storage)
bool NzIndexBuffer::SetStorage(nzDataStorage storage)
{
return m_buffer->SetStorage(storage);
}

2
src/Nazara/Utility/Mesh.cpp
View File

@ -26,7 +26,7 @@
NzMeshParams::NzMeshParams()
{
if (!NzBuffer::IsSupported(storage))
storage = nzBufferStorage_Software;
storage = nzDataStorage_Software;
}
bool NzMeshParams::IsValid() const

6
src/Nazara/Utility/VertexBuffer.cpp
View File

@ -20,7 +20,7 @@ NzVertexBuffer::NzVertexBuffer(const NzVertexDeclaration* vertexDeclaration, NzB
Reset(vertexDeclaration, buffer, startOffset, endOffset);
}
NzVertexBuffer::NzVertexBuffer(const NzVertexDeclaration* vertexDeclaration, unsigned int length, nzBufferStorage storage, nzBufferUsage usage)
NzVertexBuffer::NzVertexBuffer(const NzVertexDeclaration* vertexDeclaration, unsigned int length, nzDataStorage storage, nzBufferUsage usage)
{
NzErrorFlags(nzErrorFlag_ThrowException, true);
Reset(vertexDeclaration, length, storage, usage);
@ -230,7 +230,7 @@ void NzVertexBuffer::Reset(const NzVertexDeclaration* vertexDeclaration, NzBuffe
m_vertexDeclaration = vertexDeclaration;
}
void NzVertexBuffer::Reset(const NzVertexDeclaration* vertexDeclaration, unsigned int length, nzBufferStorage storage, nzBufferUsage usage)
void NzVertexBuffer::Reset(const NzVertexDeclaration* vertexDeclaration, unsigned int length, nzDataStorage storage, nzBufferUsage usage)
{
m_endOffset = length * ((vertexDeclaration) ? vertexDeclaration->GetStride() : 1);
m_startOffset = 0;
@ -259,7 +259,7 @@ void NzVertexBuffer::Reset(NzVertexBuffer&& vertexBuffer) noexcept
m_vertexDeclaration = std::move(vertexBuffer.m_vertexDeclaration);
}
bool NzVertexBuffer::SetStorage(nzBufferStorage storage)
bool NzVertexBuffer::SetStorage(nzDataStorage storage)
{
return m_buffer->SetStorage(storage);
}