Remove individual uniforms from instancing light maps

shader/shadow/cap.geom

@@ -2,13 +2,13 @@
 layout (triangles) in;
 layout (triangle_strip, max_vertices = 3) out;
 layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-//layout (std140, binding = 1) uniform LightsBlock
-//{
-//    vec4 posBool[20];
-//    vec4 colRad[20];
-//} ;
-uniform vec3 lightPos;
+layout (std140, binding = 1) uniform LightsBlock
+{
+    vec4 posBool[20];
+    vec4 colRad[20];
+} ;
 uniform int lightID;
+vec3 lightPos = posBool[lightID].xyz ;
 // this code is duplicated in lineShadow.geom, should not be changed on its own
 vec4 projNear (vec4 pos)
 {

shader/shadow/edge.geom

@@ -7,11 +7,8 @@ layout (std140, binding = 1) uniform LightsBlock
     vec4 posBool[20];
     vec4 colRad[20];
 } ;
-//uniform vec3 lightPos;
-//uniform float radiusUniform;
 uniform int lightID;
 vec3 lightPos1 = posBool[lightID].xyz;
-//vec3 lightPos1 = lightPos;
 float theBool = posBool[lightID].w;
 vec4 shift (vec4 p) { return (vec4 (p.xyz + (100000*(p.xyz-lightPos1)), 1));} ;
 vec4 shiftBy (float x,vec4 p) { return (vec4 (lightPos1 + (x*normalize(p.xyz-lightPos1)), 1));} ;

shader/shadow/light.frag

@@ -4,8 +4,9 @@ layout (std140, binding = 1) uniform LightsBlock
     vec4 posBool[20];
     vec4 colRad[20];
 } ;
-uniform vec3 lightPos;
-uniform vec4 lumRad;
+uniform int lightID;
+vec3 lightPos = posBool[lightID].xyz;
+vec4 lumRad = colRad[lightID];
 uniform sampler2D screenTexture;
 in vec2 vTexPos;
 out vec4 fColor;

shader/shadow/wallShadow.geom

@@ -7,8 +7,8 @@ layout (std140, binding = 1) uniform LightsBlock
     vec4 posBool[20];
     vec4 colRad[20];
 } ;
-uniform vec3 lightPos;
 uniform int lightID;
+vec3 lightPos = posBool[lightID].xyz;
 vec4 shift (vec4 p)
 { return vec4 (p.xy + (200 * (p.xy-lightPos.xy)), 0 , 1);
 }