diff --git a/include/Nazara/Core/HashImpl.hpp b/include/Nazara/Core/AbstractHash.hpp similarity index 67% rename from include/Nazara/Core/HashImpl.hpp rename to include/Nazara/Core/AbstractHash.hpp index dfbe3b32a..c6e856171 100644 --- a/include/Nazara/Core/HashImpl.hpp +++ b/include/Nazara/Core/AbstractHash.hpp @@ -4,23 +4,23 @@ #pragma once -#ifndef NAZARA_HASHIMPL_HPP -#define NAZARA_HASHIMPL_HPP +#ifndef NAZARA_ABSTRACTHASH_HPP +#define NAZARA_ABSTRACTHASH_HPP #include #include class NzHashDigest; -class NAZARA_API NzHashImpl : NzNonCopyable +class NAZARA_API NzAbstractHash : NzNonCopyable { public: - NzHashImpl() = default; - virtual ~NzHashImpl() {} + NzAbstractHash() = default; + virtual ~NzAbstractHash(); virtual void Append(const nzUInt8* data, unsigned int len) = 0; virtual void Begin() = 0; virtual NzHashDigest End() = 0; }; -#endif // NAZARA_HASHIMPL_HPP +#endif // NAZARA_ABSTRACTHASH_HPP diff --git a/include/Nazara/Core/ByteArray.hpp b/include/Nazara/Core/ByteArray.hpp index 62325f874..7797ade76 100644 --- a/include/Nazara/Core/ByteArray.hpp +++ b/include/Nazara/Core/ByteArray.hpp @@ -112,7 +112,7 @@ class NAZARA_API NzByteArray : public NzHashable private: void EnsureOwnership(); - bool FillHash(NzHashImpl* hash) const; + bool FillHash(NzAbstractHash* hash) const; void ReleaseArray(); SharedArray* m_sharedArray; diff --git a/include/Nazara/Core/File.hpp b/include/Nazara/Core/File.hpp index d3c746e73..c2c2a07bd 100644 --- a/include/Nazara/Core/File.hpp +++ b/include/Nazara/Core/File.hpp @@ -103,7 +103,7 @@ class NAZARA_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable static time_t GetLastAccessTime(const NzString& filePath); static time_t GetLastWriteTime(const NzString& filePath); static NzHashDigest GetHash(const NzString& filePath, nzHash hash); - static NzHashDigest GetHash(const NzString& filePath, NzHashImpl* hash); + static NzHashDigest GetHash(const NzString& filePath, NzAbstractHash* hash); static nzUInt64 GetSize(const NzString& filePath); static bool IsAbsolute(const NzString& filePath); static NzString NormalizePath(const NzString& filePath); @@ -111,7 +111,7 @@ class NAZARA_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable static bool Rename(const NzString& sourcePath, const NzString& targetPath); private: - bool FillHash(NzHashImpl* hash) const; + bool FillHash(NzAbstractHash* hash) const; NazaraMutexAttrib(m_mutex, mutable) diff --git a/include/Nazara/Core/Hash.hpp b/include/Nazara/Core/Hash.hpp index 31a8f2729..f8fe1483a 100644 --- a/include/Nazara/Core/Hash.hpp +++ b/include/Nazara/Core/Hash.hpp @@ -8,22 +8,22 @@ #define NAZARA_HASH_HPP #include +#include #include #include -#include #include class NAZARA_API NzHash : NzNonCopyable { public: NzHash(nzHash hash); - NzHash(NzHashImpl* hashImpl); + NzHash(NzAbstractHash* hashImpl); ~NzHash(); NzHashDigest Hash(const NzHashable& hashable); private: - NzHashImpl* m_impl; + NzAbstractHash* m_impl; }; #endif // NAZARA_HASH_HPP diff --git a/include/Nazara/Core/Hash/CRC32.hpp b/include/Nazara/Core/Hash/CRC32.hpp index c26fbf867..5ad105602 100644 --- a/include/Nazara/Core/Hash/CRC32.hpp +++ b/include/Nazara/Core/Hash/CRC32.hpp @@ -8,12 +8,12 @@ #define NAZARA_HASH_CRC32_HPP #include +#include #include -#include struct NzHashCRC32_state; -class NAZARA_API NzHashCRC32 : public NzHashImpl +class NAZARA_API NzHashCRC32 : public NzAbstractHash { public: NzHashCRC32(nzUInt32 polynomial = 0x04c11db7); diff --git a/include/Nazara/Core/Hash/Fletcher16.hpp b/include/Nazara/Core/Hash/Fletcher16.hpp index 759ffa76e..f8fc1cc02 100644 --- a/include/Nazara/Core/Hash/Fletcher16.hpp +++ b/include/Nazara/Core/Hash/Fletcher16.hpp @@ -8,13 +8,13 @@ #define NAZARA_HASH_FLETCHER16_HPP #include +#include #include -#include #include struct NzHashFletcher16_state; -class NAZARA_API NzHashFletcher16 : public NzHashImpl +class NAZARA_API NzHashFletcher16 : public NzAbstractHash { public: NzHashFletcher16(); diff --git a/include/Nazara/Core/Hash/MD5.hpp b/include/Nazara/Core/Hash/MD5.hpp index b59e40ce8..8d1cde105 100644 --- a/include/Nazara/Core/Hash/MD5.hpp +++ b/include/Nazara/Core/Hash/MD5.hpp @@ -8,12 +8,12 @@ #define NAZARA_HASH_MD5_HPP #include +#include #include -#include struct NzHashMD5_state; -class NAZARA_API NzHashMD5 : public NzHashImpl +class NAZARA_API NzHashMD5 : public NzAbstractHash { public: NzHashMD5(); diff --git a/include/Nazara/Core/Hash/SHA1.hpp b/include/Nazara/Core/Hash/SHA1.hpp index cfcb801b4..1bf800053 100644 --- a/include/Nazara/Core/Hash/SHA1.hpp +++ b/include/Nazara/Core/Hash/SHA1.hpp @@ -8,12 +8,12 @@ #define NAZARA_HASH_SHA1_HPP #include +#include #include -#include union SHA_CTX; -class NAZARA_API NzHashSHA1 : public NzHashImpl +class NAZARA_API NzHashSHA1 : public NzAbstractHash { public: NzHashSHA1(); diff --git a/include/Nazara/Core/Hash/SHA224.hpp b/include/Nazara/Core/Hash/SHA224.hpp index 761eaaf7c..931276c67 100644 --- a/include/Nazara/Core/Hash/SHA224.hpp +++ b/include/Nazara/Core/Hash/SHA224.hpp @@ -8,12 +8,12 @@ #define NAZARA_HASH_SHA224_HPP #include +#include #include -#include union SHA_CTX; -class NAZARA_API NzHashSHA224 : public NzHashImpl +class NAZARA_API NzHashSHA224 : public NzAbstractHash { public: NzHashSHA224(); diff --git a/include/Nazara/Core/Hash/SHA256.hpp b/include/Nazara/Core/Hash/SHA256.hpp index 24db2dc8e..0620aa4f4 100644 --- a/include/Nazara/Core/Hash/SHA256.hpp +++ b/include/Nazara/Core/Hash/SHA256.hpp @@ -8,12 +8,12 @@ #define NAZARA_HASH_SHA256_HPP #include +#include #include -#include union SHA_CTX; -class NAZARA_API NzHashSHA256 : public NzHashImpl +class NAZARA_API NzHashSHA256 : public NzAbstractHash { public: NzHashSHA256(); diff --git a/include/Nazara/Core/Hash/SHA384.hpp b/include/Nazara/Core/Hash/SHA384.hpp index 8394b193f..6e41f706d 100644 --- a/include/Nazara/Core/Hash/SHA384.hpp +++ b/include/Nazara/Core/Hash/SHA384.hpp @@ -8,12 +8,12 @@ #define NAZARA_HASH_SHA384_HPP #include +#include #include -#include union SHA_CTX; -class NAZARA_API NzHashSHA384 : public NzHashImpl +class NAZARA_API NzHashSHA384 : public NzAbstractHash { public: NzHashSHA384(); diff --git a/include/Nazara/Core/Hash/SHA512.hpp b/include/Nazara/Core/Hash/SHA512.hpp index b96a77078..8c602be53 100644 --- a/include/Nazara/Core/Hash/SHA512.hpp +++ b/include/Nazara/Core/Hash/SHA512.hpp @@ -8,12 +8,12 @@ #define NAZARA_HASH_SHA512_HPP #include +#include #include -#include union SHA_CTX; -class NAZARA_API NzHashSHA512 : public NzHashImpl +class NAZARA_API NzHashSHA512 : public NzAbstractHash { public: NzHashSHA512(); diff --git a/include/Nazara/Core/Hash/Whirlpool.hpp b/include/Nazara/Core/Hash/Whirlpool.hpp index 03768a2fd..f8940b9e9 100644 --- a/include/Nazara/Core/Hash/Whirlpool.hpp +++ b/include/Nazara/Core/Hash/Whirlpool.hpp @@ -6,12 +6,12 @@ #define NAZARA_HASH_WHIRLPOOL_HPP #include +#include #include -#include struct NzHashWhirlpool_state; -class NAZARA_API NzHashWhirlpool : public NzHashImpl +class NAZARA_API NzHashWhirlpool : public NzAbstractHash { public: NzHashWhirlpool(); diff --git a/include/Nazara/Core/Hashable.hpp b/include/Nazara/Core/Hashable.hpp index b046b90c4..0492fcd97 100644 --- a/include/Nazara/Core/Hashable.hpp +++ b/include/Nazara/Core/Hashable.hpp @@ -22,8 +22,8 @@ enum nzHash nzHash_Whirlpool }; +class NzAbstractHash; class NzHashDigest; -class NzHashImpl; class NAZARA_API NzHashable { @@ -34,10 +34,10 @@ class NAZARA_API NzHashable virtual ~NzHashable(); NzHashDigest GetHash(nzHash hash) const; - NzHashDigest GetHash(NzHashImpl* impl) const; + NzHashDigest GetHash(NzAbstractHash* impl) const; private: - virtual bool FillHash(NzHashImpl* impl) const = 0; + virtual bool FillHash(NzAbstractHash* impl) const = 0; }; #endif // HASHABLE_HPP_INCLUDED diff --git a/include/Nazara/Core/String.hpp b/include/Nazara/Core/String.hpp index dad7becb8..76a725ca9 100644 --- a/include/Nazara/Core/String.hpp +++ b/include/Nazara/Core/String.hpp @@ -302,7 +302,7 @@ class NAZARA_API NzString : public NzHashable private: void EnsureOwnership(); - bool FillHash(NzHashImpl* hash) const; + bool FillHash(NzAbstractHash* hash) const; void ReleaseString(); SharedString* m_sharedString; diff --git a/include/Nazara/Renderer/Shader.hpp b/include/Nazara/Renderer/Shader.hpp index 0ba93cee8..d79b314d5 100644 --- a/include/Nazara/Renderer/Shader.hpp +++ b/include/Nazara/Renderer/Shader.hpp @@ -20,12 +20,12 @@ #include class NzShader; -class NzTexture; using NzShaderConstRef = NzResourceRef; using NzShaderRef = NzResourceRef; -class NzShaderImpl; +class NzAbstractShader; +class NzTexture; class NAZARA_API NzShader : public NzResource, NzNonCopyable { @@ -82,7 +82,7 @@ class NAZARA_API NzShader : public NzResource, NzNonCopyable private: nzUInt32 m_flags; - NzShaderImpl* m_impl; + NzAbstractShader* m_impl; bool m_compiled; }; diff --git a/include/Nazara/Utility/Buffer.hpp b/include/Nazara/Utility/Buffer.hpp index 32746b51f..89a9f3608 100644 --- a/include/Nazara/Utility/Buffer.hpp +++ b/include/Nazara/Utility/Buffer.hpp @@ -18,14 +18,14 @@ class NzBuffer; using NzBufferConstRef = NzResourceRef; using NzBufferRef = NzResourceRef; -class NzBufferImpl; +class NzAbstractBuffer; class NAZARA_API NzBuffer : public NzResource, NzNonCopyable { friend class NzUtility; public: - using BufferFunction = NzBufferImpl* (*)(NzBuffer* parent, nzBufferType type); + using BufferFunction = NzAbstractBuffer* (*)(NzBuffer* parent, nzBufferType type); NzBuffer(nzBufferType type); NzBuffer(nzBufferType type, unsigned int length, nzUInt8 typeSize, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static); @@ -38,7 +38,7 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable bool Fill(const void* data, unsigned int offset, unsigned int length, bool forceDiscard = false); - NzBufferImpl* GetImpl() const; + NzAbstractBuffer* GetImpl() const; unsigned int GetLength() const; void* GetPointer(); const void* GetPointer() const; @@ -69,7 +69,7 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable nzBufferType m_type; nzBufferUsage m_usage; nzUInt8 m_typeSize; - NzBufferImpl* m_impl; + NzAbstractBuffer* m_impl; unsigned int m_length; static BufferFunction s_bufferFunctions[nzBufferStorage_Max+1]; diff --git a/include/Nazara/Utility/BufferImpl.hpp b/include/Nazara/Utility/BufferImpl.hpp deleted file mode 100644 index f2ee35a2c..000000000 --- a/include/Nazara/Utility/BufferImpl.hpp +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2013 Jérôme Leclercq -// This file is part of the "Nazara Engine - Utility module" -// For conditions of distribution and use, see copyright notice in Config.hpp - -#pragma once - -#ifndef NAZARA_BUFFERIMPL_HPP -#define NAZARA_BUFFERIMPL_HPP - -#include - -class NAZARA_API NzBufferImpl -{ - public: - NzBufferImpl() = default; - virtual ~NzBufferImpl(); - - virtual bool Create(unsigned int size, nzBufferUsage usage = nzBufferUsage_Static) = 0; - virtual void Destroy() = 0; - - virtual bool Fill(const void* data, unsigned int offset, unsigned int size, bool forceDiscard = false) = 0; - - virtual void* GetPointer() = 0; - - virtual bool IsHardware() const = 0; - - virtual void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int size = 0) = 0; - virtual bool Unmap() = 0; -}; - -#endif // NAZARA_BUFFERIMPL_INCLUDED diff --git a/src/Nazara/Core/File.cpp b/src/Nazara/Core/File.cpp index 295b5d8bd..64288daf2 100644 --- a/src/Nazara/Core/File.cpp +++ b/src/Nazara/Core/File.cpp @@ -3,10 +3,10 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include +#include #include #include #include -#include #include #include #include @@ -631,7 +631,7 @@ NzHashDigest NzFile::GetHash(const NzString& filePath, nzHash hash) return h.Hash(file); } -NzHashDigest NzFile::GetHash(const NzString& filePath, NzHashImpl* hash) +NzHashDigest NzFile::GetHash(const NzString& filePath, NzAbstractHash* hash) { NzFile file(filePath); @@ -707,7 +707,7 @@ bool NzFile::Rename(const NzString& sourcePath, const NzString& targetPath) return NzFileImpl::Rename(NormalizePath(sourcePath), NormalizePath(targetPath)); } -bool NzFile::FillHash(NzHashImpl* hash) const +bool NzFile::FillHash(NzAbstractHash* hash) const { NzFile file(m_filePath); if (!file.Open(NzFile::ReadOnly)) diff --git a/src/Nazara/Core/Hash.cpp b/src/Nazara/Core/Hash.cpp index 275abf6f4..5244fd077 100644 --- a/src/Nazara/Core/Hash.cpp +++ b/src/Nazara/Core/Hash.cpp @@ -56,7 +56,7 @@ NzHash::NzHash(nzHash hash) } } -NzHash::NzHash(NzHashImpl* hashImpl) : +NzHash::NzHash(NzAbstractHash* hashImpl) : m_impl(hashImpl) { } diff --git a/src/Nazara/Core/Hashable.cpp b/src/Nazara/Core/Hashable.cpp index b45f54d82..94b7742c9 100644 --- a/src/Nazara/Core/Hashable.cpp +++ b/src/Nazara/Core/Hashable.cpp @@ -14,7 +14,7 @@ NzHashDigest NzHashable::GetHash(nzHash hash) const return h.Hash(*this); } -NzHashDigest NzHashable::GetHash(NzHashImpl* impl) const +NzHashDigest NzHashable::GetHash(NzAbstractHash* impl) const { NzHash h(impl); return h.Hash(*this); diff --git a/src/Nazara/Core/String.cpp b/src/Nazara/Core/String.cpp index 040796c34..7e7d947d0 100644 --- a/src/Nazara/Core/String.cpp +++ b/src/Nazara/Core/String.cpp @@ -3,9 +3,9 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include +#include #include #include -#include #include #include #include @@ -5094,7 +5094,7 @@ void NzString::EnsureOwnership() } } -bool NzString::FillHash(NzHashImpl* hazh) const +bool NzString::FillHash(NzAbstractHash* hazh) const { hazh->Append(reinterpret_cast(m_sharedString->string), m_sharedString->size); diff --git a/src/Nazara/Renderer/ShaderImpl.cpp b/src/Nazara/Renderer/AbstractShader.cpp similarity index 69% rename from src/Nazara/Renderer/ShaderImpl.cpp rename to src/Nazara/Renderer/AbstractShader.cpp index 023c481bb..fdcb10986 100644 --- a/src/Nazara/Renderer/ShaderImpl.cpp +++ b/src/Nazara/Renderer/AbstractShader.cpp @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include -NzShaderImpl::~NzShaderImpl() = default; +NzAbstractShader::~NzAbstractShader() = default; diff --git a/src/Nazara/Renderer/ShaderImpl.hpp b/src/Nazara/Renderer/AbstractShader.hpp similarity index 90% rename from src/Nazara/Renderer/ShaderImpl.hpp rename to src/Nazara/Renderer/AbstractShader.hpp index 573b7c160..9d6ad582b 100644 --- a/src/Nazara/Renderer/ShaderImpl.hpp +++ b/src/Nazara/Renderer/AbstractShader.hpp @@ -4,18 +4,18 @@ #pragma once -#ifndef NAZARA_SHADERIMPL_HPP -#define NAZARA_SHADERIMPL_HPP +#ifndef NAZARA_ABSTRACTSHADER_HPP +#define NAZARA_ABSTRACTSHADER_HPP #include -class NzShaderImpl +class NzAbstractShader { friend class NzRenderer; public: - NzShaderImpl() = default; - virtual ~NzShaderImpl(); + NzAbstractShader() = default; + virtual ~NzAbstractShader(); virtual bool Bind() = 0; virtual bool BindTextures() = 0; @@ -51,4 +51,4 @@ class NzShaderImpl virtual bool SendVector(int location, const NzVector4f& vector) = 0; }; -#endif // NAZARA_SHADERIMPL_HPP +#endif // NAZARA_ABSTRACTSHADER_HPP diff --git a/src/Nazara/Renderer/GLSLShader.hpp b/src/Nazara/Renderer/GLSLShader.hpp index 38ed20eb3..1633fdd6c 100644 --- a/src/Nazara/Renderer/GLSLShader.hpp +++ b/src/Nazara/Renderer/GLSLShader.hpp @@ -9,14 +9,14 @@ #include #include +#include #include #include -#include #include class NzResource; -class NzGLSLShader : public NzShaderImpl, NzResourceListener +class NzGLSLShader : public NzAbstractShader, NzResourceListener { public: NzGLSLShader(NzShader* parent); diff --git a/src/Nazara/Renderer/HardwareBuffer.hpp b/src/Nazara/Renderer/HardwareBuffer.hpp index 5ef17654b..11d92c91d 100644 --- a/src/Nazara/Renderer/HardwareBuffer.hpp +++ b/src/Nazara/Renderer/HardwareBuffer.hpp @@ -9,9 +9,9 @@ #include #include -#include +#include -class NzHardwareBuffer : public NzBufferImpl +class NzHardwareBuffer : public NzAbstractBuffer { public: NzHardwareBuffer(NzBuffer* parent, nzBufferType type); diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp index 97df63ead..508e03526 100644 --- a/src/Nazara/Renderer/Renderer.cpp +++ b/src/Nazara/Renderer/Renderer.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -15,9 +16,8 @@ #include #include #include -#include #include -#include +#include #include #include #include @@ -62,7 +62,7 @@ namespace bool textureUpdated = true; }; - NzBufferImpl* HardwareBufferFunction(NzBuffer* parent, nzBufferType type) + NzAbstractBuffer* HardwareBufferFunction(NzBuffer* parent, nzBufferType type) { return new NzHardwareBuffer(parent, type); } @@ -1433,7 +1433,7 @@ bool NzRenderer::EnsureStateUpdate() } #endif - NzShaderImpl* shaderImpl; + NzAbstractShader* shaderImpl; if (s_updateFlags & Update_Shader) { @@ -1664,7 +1664,10 @@ bool NzRenderer::EnsureStateUpdate() } } else - glDisableVertexAttribArray(NzOpenGL::AttributeIndex[nzElementUsage_TexCoord]+8); + { + for (unsigned int i = 8; i < 8+4; ++i) + glDisableVertexAttribArray(NzOpenGL::AttributeIndex[nzElementUsage_TexCoord]+i); + } if (s_indexBuffer) { diff --git a/src/Nazara/Renderer/Shader.cpp b/src/Nazara/Renderer/Shader.cpp index e4297a85b..c3497da99 100644 --- a/src/Nazara/Renderer/Shader.cpp +++ b/src/Nazara/Renderer/Shader.cpp @@ -7,10 +7,10 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/src/Nazara/Utility/BufferImpl.cpp b/src/Nazara/Utility/AbstractBuffer.cpp similarity index 69% rename from src/Nazara/Utility/BufferImpl.cpp rename to src/Nazara/Utility/AbstractBuffer.cpp index 108d13445..403a86589 100644 --- a/src/Nazara/Utility/BufferImpl.cpp +++ b/src/Nazara/Utility/AbstractBuffer.cpp @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - Utility module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include -NzBufferImpl::~NzBufferImpl() = default; +NzAbstractBuffer::~NzAbstractBuffer() = default; diff --git a/src/Nazara/Utility/Buffer.cpp b/src/Nazara/Utility/Buffer.cpp index a4415f747..a7af2b861 100644 --- a/src/Nazara/Utility/Buffer.cpp +++ b/src/Nazara/Utility/Buffer.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include @@ -14,7 +14,7 @@ namespace { - NzBufferImpl* SoftwareBufferFunction(NzBuffer* parent, nzBufferType type) + NzAbstractBuffer* SoftwareBufferFunction(NzBuffer* parent, nzBufferType type) { return new NzSoftwareBuffer(parent, type); } @@ -86,7 +86,7 @@ bool NzBuffer::Create(unsigned int length, nzUInt8 typeSize, nzBufferStorage sto return false; } - NzBufferImpl* impl = s_bufferFunctions[storage](this, m_type); + NzAbstractBuffer* impl = s_bufferFunctions[storage](this, m_type); if (!impl->Create(length*typeSize, usage)) { NazaraError("Failed to create buffer"); @@ -136,7 +136,7 @@ bool NzBuffer::Fill(const void* data, unsigned int offset, unsigned int length, return m_impl->Fill(data, offset*m_typeSize, ((length == 0) ? m_length-offset : length)*m_typeSize, forceDiscard); } -NzBufferImpl* NzBuffer::GetImpl() const +NzAbstractBuffer* NzBuffer::GetImpl() const { return m_impl; } @@ -279,7 +279,7 @@ bool NzBuffer::SetStorage(nzBufferStorage storage) return false; } - NzBufferImpl* impl = s_bufferFunctions[storage](this, m_type); + NzAbstractBuffer* impl = s_bufferFunctions[storage](this, m_type); if (!impl->Create(m_length*m_typeSize, m_usage)) { NazaraError("Failed to create buffer"); diff --git a/src/Nazara/Utility/SoftwareBuffer.hpp b/src/Nazara/Utility/SoftwareBuffer.hpp index be9c518ae..d8705f70d 100644 --- a/src/Nazara/Utility/SoftwareBuffer.hpp +++ b/src/Nazara/Utility/SoftwareBuffer.hpp @@ -8,9 +8,9 @@ #define NAZARA_SOFTWAREBUFFER_HPP #include -#include +#include -class NzSoftwareBuffer : public NzBufferImpl +class NzSoftwareBuffer : public NzAbstractBuffer { public: NzSoftwareBuffer(NzBuffer* parent, nzBufferType type);