From f88c6cf0d73993abdf819eee4803c54b39883725 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Fri, 4 Apr 2014 14:56:45 +0200
Subject: [PATCH] Fixed debug shader not compiling on some configurations

Former-commit-id: 7e31eec475dc5e40491f480e9f45476acab5fdb6
---
 src/Nazara/Graphics/DeferredPhongLightingPass.cpp         | 8 ++++++--
 .../Renderer/Resources/Shaders/Debug/compatibility.frag   | 2 +-
 .../Renderer/Resources/Shaders/Debug/compatibility.frag.h | 2 +-
 src/Nazara/Renderer/Resources/Shaders/Debug/core.frag     | 2 +-
 src/Nazara/Renderer/Resources/Shaders/Debug/core.frag.h   | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Nazara/Graphics/DeferredPhongLightingPass.cpp b/src/Nazara/Graphics/DeferredPhongLightingPass.cpp
index d56047b7e..7068114cc 100644
--- a/src/Nazara/Graphics/DeferredPhongLightingPass.cpp
+++ b/src/Nazara/Graphics/DeferredPhongLightingPass.cpp
@@ -176,6 +176,8 @@ bool NzDeferredPhongLightingPass::Process(const NzScene* scene, unsigned int fir
 				NzRenderer::SetFaceFilling(nzFaceFilling_Line);
 
 				const NzShader* shader = NzShaderLibrary::Get("DebugSimple");
+				static int colorLocation = shader->GetUniformLocation("Color");
+
 				NzRenderer::SetShader(shader);
 				for (const NzLight* light : m_renderQueue->pointLights)
 				{
@@ -184,7 +186,7 @@ bool NzDeferredPhongLightingPass::Process(const NzScene* scene, unsigned int fir
 
 					NzRenderer::SetMatrix(nzMatrixType_World, lightMatrix);
 
-					shader->SendColor(0, light->GetColor());
+					shader->SendColor(colorLocation, light->GetColor());
 
 					NzRenderer::DrawIndexedPrimitives(nzPrimitiveMode_TriangleList, 0, indexBuffer->GetIndexCount());
 				}
@@ -243,6 +245,8 @@ bool NzDeferredPhongLightingPass::Process(const NzScene* scene, unsigned int fir
 				NzRenderer::SetFaceFilling(nzFaceFilling_Line);
 
 				const NzShader* shader = NzShaderLibrary::Get("DebugSimple");
+				static int colorLocation = shader->GetUniformLocation("Color");
+
 				NzRenderer::SetShader(shader);
 				for (const NzLight* light : m_renderQueue->spotLights)
 				{
@@ -251,7 +255,7 @@ bool NzDeferredPhongLightingPass::Process(const NzScene* scene, unsigned int fir
 
 					NzRenderer::SetMatrix(nzMatrixType_World, lightMatrix);
 
-					shader->SendColor(0, light->GetColor());
+					shader->SendColor(colorLocation, light->GetColor());
 
 					NzRenderer::DrawIndexedPrimitives(nzPrimitiveMode_TriangleList, 0, indexBuffer->GetIndexCount());
 				}
diff --git a/src/Nazara/Renderer/Resources/Shaders/Debug/compatibility.frag b/src/Nazara/Renderer/Resources/Shaders/Debug/compatibility.frag
index 42214ce83..040d69895 100644
--- a/src/Nazara/Renderer/Resources/Shaders/Debug/compatibility.frag
+++ b/src/Nazara/Renderer/Resources/Shaders/Debug/compatibility.frag
@@ -1,7 +1,7 @@
 #version 110
 
 /********************Uniformes********************/
-layout(location = 0) uniform vec4 Color;
+uniform vec4 Color;
 
 /********************Fonctions********************/
 void main()
diff --git a/src/Nazara/Renderer/Resources/Shaders/Debug/compatibility.frag.h b/src/Nazara/Renderer/Resources/Shaders/Debug/compatibility.frag.h
index 6c4b0177c..7a6061298 100644
--- a/src/Nazara/Renderer/Resources/Shaders/Debug/compatibility.frag.h
+++ b/src/Nazara/Renderer/Resources/Shaders/Debug/compatibility.frag.h
@@ -1 +1 @@
-35,118,101,114,115,105,111,110,32,49,49,48,13,10,13,10,47,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,85,110,105,102,111,114,109,101,115,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,47,13,10,108,97,121,111,117,116,40,108,111,99,97,116,105,111,110,32,61,32,48,41,32,117,110,105,102,111,114,109,32,118,101,99,52,32,67,111,108,111,114,59,13,10,13,10,47,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,70,111,110,99,116,105,111,110,115,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,47,13,10,118,111,105,100,32,109,97,105,110,40,41,13,10,123,13,10,9,103,108,95,70,114,97,103,67,111,108,111,114,32,61,32,67,111,108,111,114,59,13,10,125,
\ No newline at end of file
+35,118,101,114,115,105,111,110,32,49,49,48,13,10,13,10,47,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,85,110,105,102,111,114,109,101,115,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,47,13,10,117,110,105,102,111,114,109,32,118,101,99,52,32,67,111,108,111,114,59,13,10,13,10,47,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,70,111,110,99,116,105,111,110,115,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,47,13,10,118,111,105,100,32,109,97,105,110,40,41,13,10,123,13,10,9,103,108,95,70,114,97,103,67,111,108,111,114,32,61,32,67,111,108,111,114,59,13,10,125,
\ No newline at end of file
diff --git a/src/Nazara/Renderer/Resources/Shaders/Debug/core.frag b/src/Nazara/Renderer/Resources/Shaders/Debug/core.frag
index 40353e7e7..4bb28b00c 100644
--- a/src/Nazara/Renderer/Resources/Shaders/Debug/core.frag
+++ b/src/Nazara/Renderer/Resources/Shaders/Debug/core.frag
@@ -4,7 +4,7 @@
 out vec4 RenderTarget0;
 
 /********************Uniformes********************/
-layout(location = 0) uniform vec4 Color;
+uniform vec4 Color;
 
 /********************Fonctions********************/
 void main()
diff --git a/src/Nazara/Renderer/Resources/Shaders/Debug/core.frag.h b/src/Nazara/Renderer/Resources/Shaders/Debug/core.frag.h
index 753c2fde2..bbb324c3c 100644
--- a/src/Nazara/Renderer/Resources/Shaders/Debug/core.frag.h
+++ b/src/Nazara/Renderer/Resources/Shaders/Debug/core.frag.h
@@ -1 +1 @@
-35,118,101,114,115,105,111,110,32,49,52,48,13,10,13,10,47,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,83,111,114,116,97,110,116,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,47,13,10,111,117,116,32,118,101,99,52,32,82,101,110,100,101,114,84,97,114,103,101,116,48,59,13,10,13,10,47,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,85,110,105,102,111,114,109,101,115,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,47,13,10,108,97,121,111,117,116,40,108,111,99,97,116,105,111,110,32,61,32,48,41,32,117,110,105,102,111,114,109,32,118,101,99,52,32,67,111,108,111,114,59,13,10,13,10,47,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,70,111,110,99,116,105,111,110,115,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,47,13,10,118,111,105,100,32,109,97,105,110,40,41,13,10,123,13,10,9,82,101,110,100,101,114,84,97,114,103,101,116,48,32,61,32,67,111,108,111,114,59,13,10,125,
\ No newline at end of file
+35,118,101,114,115,105,111,110,32,49,52,48,13,10,13,10,47,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,83,111,114,116,97,110,116,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,47,13,10,111,117,116,32,118,101,99,52,32,82,101,110,100,101,114,84,97,114,103,101,116,48,59,13,10,13,10,47,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,85,110,105,102,111,114,109,101,115,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,47,13,10,117,110,105,102,111,114,109,32,118,101,99,52,32,67,111,108,111,114,59,13,10,13,10,47,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,70,111,110,99,116,105,111,110,115,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,47,13,10,118,111,105,100,32,109,97,105,110,40,41,13,10,123,13,10,9,82,101,110,100,101,114,84,97,114,103,101,116,48,32,61,32,67,111,108,111,114,59,13,10,125,
\ No newline at end of file