Add buffer support

include/Nazara/Renderer/RenderBuffer.hpp

@@ -7,31 +7,56 @@
 #ifndef NAZARA_RENDERBUFFER_HPP
 #define NAZARA_RENDERBUFFER_HPP
 
+#include <Nazara/Core/MovablePtr.hpp>
 #include <Nazara/Renderer/Config.hpp>
+#include <Nazara/Renderer/RenderDevice.hpp>
 #include <Nazara/Utility/AbstractBuffer.hpp>
 #include <Nazara/Utility/SoftwareBuffer.hpp>
+#include <memory>
+#include <unordered_map>
 
 namespace Nz
 {
+	class RenderDevice;
+
 	class NAZARA_RENDERER_API RenderBuffer : public AbstractBuffer
 	{
 		public:
-			RenderBuffer() = default;
+			inline RenderBuffer(Buffer* parent, BufferType type);
+			RenderBuffer(const RenderBuffer&) = delete;
+			RenderBuffer(RenderBuffer&&) = default;
 			~RenderBuffer() = default;
 
-			virtual bool Fill(const void* data, UInt32 offset, UInt32 size) = 0;
+			bool Fill(const void* data, UInt32 offset, UInt32 size) override final;
 
 			bool Initialize(UInt32 size, BufferUsageFlags usage) override;
 
+			AbstractBuffer* GetHardwareBuffer(RenderDevice* device);
 			DataStorage GetStorage() const override;
 
-			virtual void* Map(BufferAccess access, UInt32 offset = 0, UInt32 size = 0) = 0;
-			virtual bool Unmap() = 0;
+			void* Map(BufferAccess access, UInt32 offset = 0, UInt32 size = 0) override final;
+			bool Unmap() override final;
+
+			RenderBuffer& operator=(const RenderBuffer&) = delete;
+			RenderBuffer& operator=(RenderBuffer&&) = default;
+
+		public: //< temp
+			bool Synchronize(RenderDevice* device);
 
 		private:
-			SoftwareBuffer m_softwareBuffer;
-	};
+			struct HardwareBuffer
+			{
+				std::unique_ptr<AbstractBuffer> buffer;
+				bool synchronized = false;
+			};
 
+			BufferUsageFlags m_usage;
+			SoftwareBuffer m_softwareBuffer;
+			Buffer* m_parent;
+			BufferType m_type;
+			std::size_t m_size;
+			std::unordered_map<RenderDevice*, HardwareBuffer> m_hardwareBuffers;
+	};
 }
 
 #include <Nazara/Renderer/RenderBuffer.inl>

include/Nazara/Renderer/RenderBuffer.inl

@@ -2,11 +2,18 @@
 // This file is part of the "Nazara Engine - Utility module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Renderer/RenderBuffer.hpp>
 #include <memory>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace Nz
 {
+	inline RenderBuffer::RenderBuffer(Buffer* parent, BufferType type) :
+	m_softwareBuffer(parent, type),
+	m_parent(parent),
+	m_type(type)
+	{
+	}
 }
 
 #include <Nazara/Renderer/DebugOff.hpp>

include/Nazara/Renderer/RenderDevice.hpp

@@ -4,20 +4,28 @@
 
 #pragma once
 
-#ifndef NAZARA_RENDERDEVICE_HPP
-#define NAZARA_RENDERDEVICE_HPP
+#ifndef NAZARA_RENDERDEVICEINSTANCE_HPP
+#define NAZARA_RENDERDEVICEINSTANCE_HPP
 
-#include <Nazara/Prerequesites.hpp>
-#include <Nazara/Core/String.hpp>
-#include <Nazara/Renderer/Enums.hpp>
+#include <Nazara/Prerequisites.hpp>
+#include <Nazara/Renderer/Config.hpp>
+#include <Nazara/Utility/AbstractBuffer.hpp>
+#include <memory>
 
 namespace Nz
 {
-	struct RenderDevice
+	class Buffer;
+
+	class NAZARA_RENDERER_API RenderDevice
 	{
-		RenderDeviceType type;
-		String name;
+		public:
+			RenderDevice() = default;
+			virtual ~RenderDevice();
+
+			virtual std::unique_ptr<AbstractBuffer> InstantiateBuffer(Buffer* parent, BufferType type) = 0;
 	};
 }
 
-#endif // NAZARA_RENDERER_HPP
+#include <Nazara/Renderer/RenderDevice.inl>
+
+#endif // NAZARA_RENDERDEVICEINSTANCE_HPP

include/Nazara/Renderer/RenderDevice.inl

@@ -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 <Nazara/Renderer/RenderDeviceInstance.hpp>
+#include <Nazara/Renderer/RenderDevice.hpp>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace Nz

include/Nazara/Renderer/RenderDeviceInfo.hpp

@@ -0,0 +1,23 @@
+// Copyright (C) 2016 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Renderer module"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#pragma once
+
+#ifndef NAZARA_RENDERDEVICE_HPP
+#define NAZARA_RENDERDEVICE_HPP
+
+#include <Nazara/Prerequisites.hpp>
+#include <Nazara/Core/String.hpp>
+#include <Nazara/Renderer/Enums.hpp>
+
+namespace Nz
+{
+	struct RenderDeviceInfo
+	{
+		RenderDeviceType type;
+		String name;
+	};
+}
+
+#endif // NAZARA_RENDERER_HPP

include/Nazara/Renderer/RenderDeviceInstance.hpp

@@ -1,26 +0,0 @@
-// Copyright (C) 2016 Jérôme Leclercq
-// This file is part of the "Nazara Engine - Renderer module"
-// For conditions of distribution and use, see copyright notice in Config.hpp
-
-#pragma once
-
-#ifndef NAZARA_RENDERDEVICEINSTANCE_HPP
-#define NAZARA_RENDERDEVICEINSTANCE_HPP
-
-#include <Nazara/Prerequesites.hpp>
-#include <Nazara/Renderer/Config.hpp>
-
-namespace Nz
-{
-	///TODO: Rename
-	class NAZARA_RENDERER_API RenderDeviceInstance
-	{
-		public:
-			RenderDeviceInstance() = default;
-			virtual ~RenderDeviceInstance();
-	};
-}
-
-#include <Nazara/Renderer/RenderDeviceInstance.inl>
-
-#endif // NAZARA_RENDERDEVICEINSTANCE_HPP

include/Nazara/Renderer/RenderWindowImpl.hpp

@@ -16,6 +16,7 @@
 
 namespace Nz
 {
+	class RendererImpl;
 	class RenderSurface;
 
 	class NAZARA_RENDERER_API RenderWindowImpl
@@ -24,7 +25,7 @@ namespace Nz
 			RenderWindowImpl() = default;
 			virtual ~RenderWindowImpl();
 
-			virtual bool Create(RenderSurface* surface, const Vector2ui& size, const RenderWindowParameters& parameters) = 0;
+			virtual bool Create(RendererImpl* renderer, RenderSurface* surface, const Vector2ui& size, const RenderWindowParameters& parameters) = 0;
 	};
 }
 

include/Nazara/Renderer/RendererImpl.hpp

@@ -12,7 +12,7 @@
 #include <Nazara/Core/String.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Enums.hpp>
-#include <Nazara/Renderer/RenderDevice.hpp>
+#include <Nazara/Renderer/RenderDeviceInfo.hpp>
 #include <Nazara/Utility/AbstractBuffer.hpp>
 #include <Nazara/Utility/Enums.hpp>
 #include <vector>
@@ -21,7 +21,7 @@ namespace Nz
 {
 	class Buffer;
 	class RendererImpl;
-	class RenderDeviceInstance;
+	class RenderDevice;
 	class RenderSurface;
 	class RenderWindowImpl;
 
@@ -33,11 +33,10 @@ namespace Nz
 			RendererImpl() = default;
 			virtual ~RendererImpl();
 
-			virtual std::unique_ptr<AbstractBuffer> CreateHardwareBufferImpl(Buffer* parent, BufferType type) = 0;
 			virtual std::unique_ptr<RenderSurface> CreateRenderSurfaceImpl() = 0;
 			virtual std::unique_ptr<RenderWindowImpl> CreateRenderWindowImpl() = 0;
 
-			virtual std::unique_ptr<RenderDeviceInstance> InstanciateRenderDevice(std::size_t deviceIndex) = 0;
+			virtual std::shared_ptr<RenderDevice> InstanciateRenderDevice(std::size_t deviceIndex) = 0;
 
 			virtual bool IsBetterThan(const RendererImpl* other) const = 0;
 
@@ -45,7 +44,7 @@ namespace Nz
 			virtual String QueryAPIString() const = 0;
 			virtual UInt32 QueryAPIVersion() const = 0;
 
-			virtual std::vector<RenderDevice> QueryRenderDevices() const = 0;
+			virtual std::vector<RenderDeviceInfo> QueryRenderDevices() const = 0;
 
 			virtual bool Prepare(const ParameterList& parameters) = 0;
 	};