wip: set NUM_LIGHT_LAYERS as uint from the start

Author: illwieckz

src/engine/renderer/gl_shader.cpp

@@ -489,6 +489,11 @@ static void AddConst( std::string& str, const std::string& name, int value )
 	str += Str::Format("const int %s = %d;\n", name, value);
 }
 
+static void AddConst( std::string& str, const std::string& name, uint32_t value )
+{
+	str += Str::Format("const uint %s = %uu;\n", name, value);
+}
+
 static void AddConst( std::string& str, const std::string& name, float value )
 {
 	str += Str::Format("const float %s = %.8e;\n", name, value);
@@ -667,7 +672,9 @@ static std::string GenEngineConstants() {
 	AddDefine( str, "M_PI", static_cast< float >( M_PI ) );
 	AddDefine( str, "MAX_SHADOWMAPS", MAX_SHADOWMAPS );
 	AddDefine( str, "MAX_REF_LIGHTS", MAX_REF_LIGHTS );
-	AddDefine( str, "NUM_LIGHT_LAYERS", glConfig2.realtimeLightLayers );
+
+	AddConst( str, "NUM_LIGHT_LAYERS", (uint32_t) glConfig2.realtimeLightLayers );
+
 	AddDefine( str, "TILE_SIZE", TILE_SIZE );
 
 	AddDefine( str, "r_FBufSize", glConfig.vidWidth, glConfig.vidHeight );

src/engine/renderer/glsl_source/computeLight_fp.glsl

@@ -225,7 +225,7 @@ void computeDynamicLights( vec3 P, vec3 normal, vec3 viewDir, vec4 diffuse, vec4
 
 	vec2 tile = floor( gl_FragCoord.xy * ( 1.0 / float( TILE_SIZE ) ) ) + 0.5;
 
-	for( uint layer = 0u; layer < uint( NUM_LIGHT_LAYERS ); layer++ ) {
+	for( uint layer = 0u; layer < NUM_LIGHT_LAYERS; layer++ ) {
 		uint lightCount = 0u;
 		idxs_t idxs = fetchIdxs( tileScale * vec3( tile, float( layer ) + 0.5 ), u_LightTiles );
 
@@ -238,7 +238,7 @@ void computeDynamicLights( vec3 P, vec3 normal, vec3 viewDir, vec4 diffuse, vec4
 
 			/* Light IDs are stored relative to the layer
 			Subtract 1 because 0 means there's no light */
-			idx = ( idx - 1u ) * uint( NUM_LIGHT_LAYERS ) + layer;
+			idx = ( idx - 1u ) * NUM_LIGHT_LAYERS + layer;
 
 			computeDynamicLight( idx, P, normal, viewDir, diffuse, material, color );
 			lightCount++;

src/engine/renderer/glsl_source/lighttile_fp.glsl

@@ -120,7 +120,7 @@ void main() {
 	only process 1 / 4 of different lights for each layer, extra lights going into the last layer. This can fail to add some lights
 	if 1 / 4 of all lights is more than the amount of lights that each layer can hold (16). To fix this, we'd need to either do this on CPU
 	or use compute shaders with atomics so we can have a variable amount of lights for each tile. */
-	for( uint i = uint( u_lightLayer ); i < uint( u_numLights ); i += uint( NUM_LIGHT_LAYERS ) ) {
+	for( uint i = uint( u_lightLayer ); i < uint( u_numLights ); i += NUM_LIGHT_LAYERS ) {
 		Light l = GetLight( i );
 		vec3 center = ( u_ModelMatrix * vec4( l.center, 1.0 ) ).xyz;
 		float radius = max( 2.0 * l.radius, 2.0 * 32.0 ); // Avoid artifacts with weak light sources
@@ -136,7 +136,7 @@ void main() {
 		if( radius > 0.0 ) {
 			/* Light IDs are stored relative to the layer
 			Add 1 because 0 means there's no light */
-			pushIdxs( ( i / uint( NUM_LIGHT_LAYERS ) ) + 1u, lightCount, idxs );
+			pushIdxs( ( i / NUM_LIGHT_LAYERS ) + 1u, lightCount, idxs );
 			lightCount++;
 
 			if( lightCount == lightsPerLayer ) {