From c276a4a6230b43351659d7f974ab8b01a06b2962 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Thu, 1 Aug 2013 23:21:08 +0200
Subject: [PATCH] Moved OpenGL header include

Former-commit-id: 655be533b7c01ae8817530fe434807ca5be62968
---
 src/Nazara/Graphics/SkyboxBackground.cpp  | 2 +-
 src/Nazara/Renderer/Context.cpp           | 2 +-
 src/Nazara/Renderer/DebugDrawer.cpp       | 2 +-
 src/Nazara/Renderer/GLSLShader.cpp        | 6 +++---
 src/Nazara/Renderer/HardwareBuffer.cpp    | 2 +-
 src/Nazara/Renderer/OcclusionQuery.cpp    | 2 +-
 src/Nazara/Renderer/RenderTexture.cpp     | 2 +-
 src/Nazara/Renderer/RenderWindow.cpp      | 2 +-
 src/Nazara/Renderer/Renderer.cpp          | 4 ++--
 src/Nazara/Renderer/Shader.cpp            | 2 +-
 src/Nazara/Renderer/ShaderManager.cpp     | 2 +-
 src/Nazara/Renderer/Texture.cpp           | 2 +-
 src/Nazara/Renderer/TextureSampler.cpp    | 2 +-
 src/Nazara/Renderer/Win32/ContextImpl.cpp | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Nazara/Graphics/SkyboxBackground.cpp b/src/Nazara/Graphics/SkyboxBackground.cpp
index 58ed45091..fa0ba81fb 100644
--- a/src/Nazara/Graphics/SkyboxBackground.cpp
+++ b/src/Nazara/Graphics/SkyboxBackground.cpp
@@ -6,10 +6,10 @@
 #define NAZARA_RENDERER_OPENGL // Nécessaire pour inclure les headers OpenGL
 #endif
 
-#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Graphics/SkyboxBackground.hpp>
 #include <Nazara/Graphics/Camera.hpp>
 #include <Nazara/Graphics/Scene.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Utility/IndexBuffer.hpp>
diff --git a/src/Nazara/Renderer/Context.cpp b/src/Nazara/Renderer/Context.cpp
index 6a072a776..adbb5e2cc 100644
--- a/src/Nazara/Renderer/Context.cpp
+++ b/src/Nazara/Renderer/Context.cpp
@@ -2,12 +2,12 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Renderer/Context.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/StringStream.hpp>
 #include <Nazara/Renderer/Config.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <vector>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
diff --git a/src/Nazara/Renderer/DebugDrawer.cpp b/src/Nazara/Renderer/DebugDrawer.cpp
index ea62c8a2c..7ea5d5c82 100644
--- a/src/Nazara/Renderer/DebugDrawer.cpp
+++ b/src/Nazara/Renderer/DebugDrawer.cpp
@@ -2,8 +2,8 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Renderer/DebugDrawer.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderStates.hpp>
 #include <Nazara/Renderer/Shader.hpp>
diff --git a/src/Nazara/Renderer/GLSLShader.cpp b/src/Nazara/Renderer/GLSLShader.cpp
index 595a891d5..e7608e0d7 100644
--- a/src/Nazara/Renderer/GLSLShader.cpp
+++ b/src/Nazara/Renderer/GLSLShader.cpp
@@ -2,11 +2,11 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Renderer/GLSLShader.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/String.hpp>
 #include <Nazara/Renderer/Context.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Utility/VertexDeclaration.hpp>
@@ -182,10 +182,10 @@ nzShaderLanguage NzGLSLShader::GetLanguage() const
 
 NzString NzGLSLShader::GetSourceCode(nzShaderType type) const
 {
-	NzContext::EnsureContext();
-
 	NzString source;
 
+	NzContext::EnsureContext();
+
 	GLint length;
 	glGetShaderiv(m_shaders[type], GL_SHADER_SOURCE_LENGTH, &length);
 	if (length > 1)
diff --git a/src/Nazara/Renderer/HardwareBuffer.cpp b/src/Nazara/Renderer/HardwareBuffer.cpp
index 55f10347d..fd2c62b04 100644
--- a/src/Nazara/Renderer/HardwareBuffer.cpp
+++ b/src/Nazara/Renderer/HardwareBuffer.cpp
@@ -2,11 +2,11 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Renderer/HardwareBuffer.hpp>
 #include <Nazara/Core/Clock.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Renderer/Context.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <cstring>
 #include <stdexcept>
 #include <Nazara/Renderer/Debug.hpp>
diff --git a/src/Nazara/Renderer/OcclusionQuery.cpp b/src/Nazara/Renderer/OcclusionQuery.cpp
index 1909976d7..f514daa4d 100644
--- a/src/Nazara/Renderer/OcclusionQuery.cpp
+++ b/src/Nazara/Renderer/OcclusionQuery.cpp
@@ -2,11 +2,11 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Renderer/OcclusionQuery.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Context.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <stdexcept>
 #include <Nazara/Renderer/Debug.hpp>
diff --git a/src/Nazara/Renderer/RenderTexture.cpp b/src/Nazara/Renderer/RenderTexture.cpp
index fdad5f545..0966f5bb6 100644
--- a/src/Nazara/Renderer/RenderTexture.cpp
+++ b/src/Nazara/Renderer/RenderTexture.cpp
@@ -2,10 +2,10 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Renderer/Context.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <vector>
 #include <Nazara/Renderer/Debug.hpp>
diff --git a/src/Nazara/Renderer/RenderWindow.cpp b/src/Nazara/Renderer/RenderWindow.cpp
index 247b63041..a1bfdc2a3 100644
--- a/src/Nazara/Renderer/RenderWindow.cpp
+++ b/src/Nazara/Renderer/RenderWindow.cpp
@@ -2,11 +2,11 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Renderer/RenderWindow.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Thread.hpp>
 #include <Nazara/Renderer/Context.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <stdexcept>
 #include <Nazara/Renderer/Debug.hpp>
diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp
index 1674979fa..0d4dfc012 100644
--- a/src/Nazara/Renderer/Renderer.cpp
+++ b/src/Nazara/Renderer/Renderer.cpp
@@ -2,7 +2,6 @@
 // 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/OpenGL.hpp> // Pour éviter une redéfinition de WIN32_LEAN_AND_MEAN
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Core/Color.hpp>
 #include <Nazara/Core/Error.hpp>
@@ -13,6 +12,7 @@
 #include <Nazara/Renderer/DebugDrawer.hpp>
 #include <Nazara/Renderer/HardwareBuffer.hpp>
 #include <Nazara/Renderer/Material.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/RenderTarget.hpp>
 #include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Renderer/ShaderManager.hpp>
@@ -1238,7 +1238,7 @@ bool NzRenderer::EnsureStateUpdate()
 	#endif
 
 	NzAbstractShader* shaderImpl = s_shader->m_impl;
-	shaderImpl->Bind();
+	shaderImpl->Bind(); // Active le shader si ce n'est pas déjà le cas
 
 	// Si le shader a été changé depuis la dernière fois
 	if (s_updateFlags & Update_Shader)
diff --git a/src/Nazara/Renderer/Shader.cpp b/src/Nazara/Renderer/Shader.cpp
index 34ca52166..271d1ecf6 100644
--- a/src/Nazara/Renderer/Shader.cpp
+++ b/src/Nazara/Renderer/Shader.cpp
@@ -2,7 +2,6 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/File.hpp>
@@ -10,6 +9,7 @@
 #include <Nazara/Renderer/AbstractShader.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/GLSLShader.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <stdexcept>
 #include <Nazara/Renderer/Debug.hpp>
diff --git a/src/Nazara/Renderer/ShaderManager.cpp b/src/Nazara/Renderer/ShaderManager.cpp
index 598abe0a2..705a56836 100644
--- a/src/Nazara/Renderer/ShaderManager.cpp
+++ b/src/Nazara/Renderer/ShaderManager.cpp
@@ -2,8 +2,8 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Core/Log.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/ShaderManager.hpp>
 #include <cstring>
 #include <memory>
diff --git a/src/Nazara/Renderer/Texture.cpp b/src/Nazara/Renderer/Texture.cpp
index cea8df8e6..bde6e5e46 100644
--- a/src/Nazara/Renderer/Texture.cpp
+++ b/src/Nazara/Renderer/Texture.cpp
@@ -2,11 +2,11 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Renderer/Context.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <memory>
 #include <stdexcept>
 #include <Nazara/Renderer/Debug.hpp>
diff --git a/src/Nazara/Renderer/TextureSampler.cpp b/src/Nazara/Renderer/TextureSampler.cpp
index 32c6e1f13..a8ff3dc74 100644
--- a/src/Nazara/Renderer/TextureSampler.cpp
+++ b/src/Nazara/Renderer/TextureSampler.cpp
@@ -2,11 +2,11 @@
 // 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/OpenGL.hpp>
 #include <Nazara/Renderer/TextureSampler.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Context.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <unordered_map>
diff --git a/src/Nazara/Renderer/Win32/ContextImpl.cpp b/src/Nazara/Renderer/Win32/ContextImpl.cpp
index a5abd5b66..7f96035ae 100644
--- a/src/Nazara/Renderer/Win32/ContextImpl.cpp
+++ b/src/Nazara/Renderer/Win32/ContextImpl.cpp
@@ -4,12 +4,12 @@
 
 // Code inspiré de NeHe (Lesson1) et de la SFML par Laurent Gomila
 
-#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Win32/ContextImpl.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/LockGuard.hpp>
 #include <Nazara/Core/Mutex.hpp>
 #include <Nazara/Renderer/Context.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
 #include <cstring>
 #include <Nazara/Renderer/Debug.hpp>