Moved lighting uniforms into light.glsl

voxygen/shaders/figure.frag

@@ -22,16 +22,6 @@ uniform u_bones {
 	BoneData bones[16];
 };
 
-struct Light {
-	vec4 light_pos;
-	vec4 light_col;
-};
-
-layout (std140)
-uniform u_lights {
-	Light lights[32];
-};
-
 #include <sky.glsl>
 #include <light.glsl>
 

voxygen/shaders/figure.vert

@@ -22,16 +22,6 @@ uniform u_bones {
 	BoneData bones[16];
 };
 
-struct Light {
-	vec4 light_pos;
-	vec4 light_col;
-};
-
-layout (std140)
-uniform u_lights {
-	Light lights[32];
-};
-
 out vec3 f_pos;
 out vec3 f_norm;
 out vec3 f_col;

voxygen/shaders/include/light.glsl

@@ -1,3 +1,13 @@
+struct Light {
+	vec4 light_pos;
+	vec4 light_col;
+};
+
+layout (std140)
+uniform u_lights {
+	Light lights[32];
+};
+
 float attenuation_strength(vec3 rpos) {
 	return 1.0 / (rpos.x * rpos.x + rpos.y * rpos.y + rpos.z * rpos.z);
 }

voxygen/shaders/terrain.frag

@@ -12,16 +12,6 @@ uniform u_locals {
 	vec3 model_offs;
 };
 
-struct Light {
-	vec4 light_pos;
-	vec4 light_col;
-};
-
-layout (std140)
-uniform u_lights {
-	Light lights[32];
-};
-
 out vec4 tgt_color;
 
 #include <sky.glsl>

voxygen/shaders/terrain.vert

@@ -10,16 +10,6 @@ uniform u_locals {
 	vec3 model_offs;
 };
 
-struct Light {
-	vec4 light_pos;
-	vec4 light_col;
-};
-
-layout (std140)
-uniform u_lights {
-	Light lights[32];
-};
-
 out vec3 f_pos;
 flat out uint f_pos_norm;
 out vec3 f_col;