Merge branch 'master' into vulkan

include/Nazara/Renderer/ConfigCheck.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2015 Jérôme Leclercq
+// Copyright (C) 2017 Jérôme Leclercq
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 

include/Nazara/Renderer/Debug.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2015 Jérôme Leclercq
+// Copyright (C) 2017 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
 

include/Nazara/Renderer/DebugOff.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2015 Jérôme Leclercq
+// Copyright (C) 2017 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
 

include/Nazara/Renderer/Enums.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2016 Jérôme Leclercq
+// Copyright (C) 2017 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
 

include/Nazara/Renderer/RenderPipeline.hpp

@@ -0,0 +1,42 @@
+// Copyright (C) 2017 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_RENDERPIPELINE_HPP
+#define NAZARA_RENDERPIPELINE_HPP
+
+#include <Nazara/Utility/Enums.hpp>
+#include <Nazara/Renderer/RenderStates.hpp>
+#include <Nazara/Renderer/Shader.hpp>
+
+namespace Nz
+{
+	struct RenderPipelineInfo : RenderStates
+	{
+		ShaderConstRef shader;
+	};
+
+	class RenderPipeline
+	{
+		public:
+			inline RenderPipeline();
+			inline ~RenderPipeline();
+
+			inline bool Create(const RenderPipelineInfo& pipelineInfo);
+			inline void Destroy();
+
+			inline const RenderPipelineInfo& GetInfo() const;
+
+			inline bool IsValid() const;
+
+		private:
+			RenderPipelineInfo m_pipelineInfo;
+			bool m_valid;
+	};
+}
+
+#include <Nazara/Renderer/RenderPipeline.inl>
+
+#endif // NAZARA_RENDERPIPELINE_HPP

include/Nazara/Renderer/RenderPipeline.inl

@@ -0,0 +1,48 @@
+// Copyright (C) 2017 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
+
+#include <Nazara/Renderer/RenderPipeline.hpp>
+#include <Nazara/Core/Error.hpp>
+#include <Nazara/Renderer/Debug.hpp>
+
+namespace Nz
+{
+	inline RenderPipeline::RenderPipeline() :
+	m_valid(false)
+	{
+	}
+
+	inline RenderPipeline::~RenderPipeline()
+	{
+	}
+
+	inline bool RenderPipeline::Create(const RenderPipelineInfo& pipelineInfo)
+	{
+		NazaraAssert(pipelineInfo.shader, "Invalid shader");
+
+		m_pipelineInfo = pipelineInfo;
+		m_valid = true;
+
+		return true;
+	}
+
+	inline void RenderPipeline::Destroy()
+	{
+		m_valid = false;
+	}
+
+	inline const RenderPipelineInfo& RenderPipeline::GetInfo() const
+	{
+		NazaraAssert(m_valid, "Invalid pipeline info");
+
+		return m_pipelineInfo;
+	}
+
+	inline bool RenderPipeline::IsValid() const
+	{
+		return m_valid;
+	}
+}
+
+#include <Nazara/Renderer/DebugOff.hpp>

include/Nazara/Renderer/RenderStates.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2015 Jérôme Leclercq
+// Copyright (C) 2017 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
 

include/Nazara/Renderer/RenderStates.inl

@@ -1,4 +1,4 @@
-// Copyright (C) 2015 Jérôme Leclercq
+// Copyright (C) 2017 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
 

include/Nazara/Renderer/RenderWindow.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2016 Jérôme Leclercq
+// Copyright (C) 2017 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
 

include/Nazara/Renderer/Renderer.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2016 Jérôme Leclercq
+// Copyright (C) 2017 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
 
@@ -23,7 +23,7 @@ namespace Nz
 		public:
 			Renderer() = delete;
 			~Renderer() = delete;
-			
+
 			static inline RendererImpl* GetRendererImpl();
 
 			static bool Initialize();

include/Nazara/Renderer/Texture.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2015 Jérôme Leclercq
+// Copyright (C) 2017 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