Add support for Uniform Buffer to Utility/Renderer

include/Nazara/Renderer/OpenGL.hpp

@@ -132,7 +132,6 @@ namespace Nz
 			static GLenum BufferLock[BufferAccess_Max+1];
 			static GLenum BufferLockRange[BufferAccess_Max+1];
 			static GLenum BufferTarget[BufferType_Max+1];
-			static GLenum BufferTargetBinding[BufferType_Max+1];
 			static GLenum ComponentType[ComponentType_Max+1];
 			static GLenum CubemapFace[6]; // Un cube possède six faces et ça n'est pas près de changer
 			static GLenum FaceFilling[FaceFilling_Max+1];
@@ -161,6 +160,7 @@ NAZARA_RENDERER_API extern PFNGLBEGINCONDITIONALRENDERPROC   glBeginConditionalR
 NAZARA_RENDERER_API extern PFNGLBEGINQUERYPROC               glBeginQuery;
 NAZARA_RENDERER_API extern PFNGLBINDATTRIBLOCATIONPROC       glBindAttribLocation;
 NAZARA_RENDERER_API extern PFNGLBINDBUFFERPROC               glBindBuffer;
+NAZARA_RENDERER_API extern PFNGLBINDBUFFERRANGEPROC          glBindBufferRange;
 NAZARA_RENDERER_API extern PFNGLBINDFRAMEBUFFERPROC          glBindFramebuffer;
 NAZARA_RENDERER_API extern PFNGLBINDFRAGDATALOCATIONPROC     glBindFragDataLocation;
 NAZARA_RENDERER_API extern PFNGLBINDRENDERBUFFERPROC         glBindRenderbuffer;

include/Nazara/Renderer/Renderer.hpp

@@ -25,6 +25,7 @@ namespace Nz
 	class Shader;
 	class Texture;
 	class TextureSampler;
+	class UniformBuffer;
 	class VertexBuffer;
 	class VertexDeclaration;
 
@@ -41,6 +42,8 @@ namespace Nz
 
 			static void BeginCondition(const GpuQuery& query, GpuQueryCondition condition);
 
+			static void BindUniformBuffer(unsigned int bindingPoint, const UniformBuffer* uniformBuffer);
+
 			static void Clear(UInt32 flags = RendererBuffer_Color | RendererBuffer_Depth);
 
 			static void DrawFullscreenQuad();

include/Nazara/Utility/Enums.hpp

@@ -49,8 +49,9 @@ namespace Nz
 	{
 		BufferType_Index,
 		BufferType_Vertex,
+		BufferType_Uniform,
 
-		BufferType_Max = BufferType_Vertex
+		BufferType_Max = BufferType_Uniform
 	};
 
 	enum BufferUsage

include/Nazara/Utility/IndexBuffer.hpp

@@ -38,7 +38,6 @@ namespace Nz
 			inline const BufferRef& GetBuffer() const;
 			inline UInt32 GetEndOffset() const;
 			inline UInt32 GetIndexCount() const;
-			inline DataStorage GetStorage() const;
 			inline UInt32 GetStride() const;
 			inline UInt32 GetStartOffset() const;
 

include/Nazara/Utility/IndexBuffer.inl

@@ -22,11 +22,6 @@ namespace Nz
 		return m_indexCount;
 	}
 
-	inline DataStorage IndexBuffer::GetStorage() const
-	{
-		return DataStorage();
-	}
-
 	inline UInt32 IndexBuffer::GetStride() const
 	{
 		return static_cast<UInt32>((m_largeIndices) ? sizeof(UInt32) : sizeof(UInt16));

include/Nazara/Utility/UniformBuffer.hpp

@@ -0,0 +1,69 @@
+// Copyright (C) 2017 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_UNIFORMBUFFER_HPP
+#define NAZARA_UNIFORMBUFFER_HPP
+
+#include <Nazara/Prerequisites.hpp>
+#include <Nazara/Core/ObjectRef.hpp>
+#include <Nazara/Core/Signal.hpp>
+#include <Nazara/Utility/Buffer.hpp>
+
+namespace Nz
+{
+	class UniformBuffer;
+
+	using UniformBufferConstRef = ObjectRef<const UniformBuffer>;
+	using UniformBufferRef = ObjectRef<UniformBuffer>;
+
+	class NAZARA_UTILITY_API UniformBuffer : public RefCounted
+	{
+		public:
+			UniformBuffer() = default;
+			UniformBuffer(BufferRef buffer);
+			UniformBuffer(BufferRef buffer, UInt32 offset, UInt32 size);
+			UniformBuffer(UInt32 length, DataStorage storage, BufferUsageFlags usage);
+			UniformBuffer(const UniformBuffer& uniformBuffer);
+			UniformBuffer(UniformBuffer&&) = delete;
+			~UniformBuffer();
+
+			bool Fill(const void* data, UInt32 offset, UInt32 size);
+
+			inline const BufferRef& GetBuffer() const;
+			inline UInt32 GetEndOffset() const;
+			inline UInt32 GetStartOffset() const;
+
+			inline bool IsValid() const;
+
+			void* Map(BufferAccess access, UInt32 offset = 0, UInt32 size = 0);
+			void* Map(BufferAccess access, UInt32 offset = 0, UInt32 size = 0) const;
+
+			void Reset();
+			void Reset(BufferRef buffer);
+			void Reset(BufferRef buffer, UInt32 offset, UInt32 size);
+			void Reset(UInt32 size, DataStorage storage, BufferUsageFlags usage);
+			void Reset(const UniformBuffer& uniformBuffer);
+
+			void Unmap() const;
+
+			UniformBuffer& operator=(const UniformBuffer& uniformBuffer);
+			UniformBuffer& operator=(UniformBuffer&&) = delete;
+
+			template<typename... Args> static UniformBufferRef New(Args&&... args);
+
+			// Signals:
+			NazaraSignal(OnUniformBufferRelease, const UniformBuffer* /*UniformBuffer*/);
+
+		private:
+			BufferRef m_buffer;
+			UInt32 m_endOffset;
+			UInt32 m_startOffset;
+	};
+}
+
+#include <Nazara/Utility/UniformBuffer.inl>
+
+#endif // NAZARA_UNIFORMBUFFER_HPP

include/Nazara/Utility/UniformBuffer.inl

@@ -0,0 +1,41 @@
+// Copyright (C) 2017 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
+
+#include <Nazara/Utility/UniformBuffer.hpp>
+#include <memory>
+#include <Nazara/Utility/Debug.hpp>
+
+namespace Nz
+{
+	inline const BufferRef& UniformBuffer::GetBuffer() const
+	{
+		return m_buffer;
+	}
+
+	inline UInt32 UniformBuffer::GetEndOffset() const
+	{
+		return m_endOffset;
+	}
+
+	inline UInt32 UniformBuffer::GetStartOffset() const
+	{
+		return m_startOffset;
+	}
+
+	inline bool UniformBuffer::IsValid() const
+	{
+		return m_buffer.IsValid();
+	}
+
+	template<typename... Args>
+	UniformBufferRef UniformBuffer::New(Args&&... args)
+	{
+		std::unique_ptr<UniformBuffer> object(new UniformBuffer(std::forward<Args>(args)...));
+		object->SetPersistent(false);
+
+		return object.release();
+	}
+}
+
+#include <Nazara/Utility/DebugOff.hpp>