drivers/glrend: hopefully, finally fix these f***ing lighting states

Author: vs49688

drivers/glrend/brender.common.glsl

@@ -22,6 +22,9 @@
 #define BRT_QUADRATIC                0u /* Quadratic attenuation, i.e. standard 1/clq ... */
 #define BRT_RADII                    1u /* Radial attenuation, i.e. linear falloff. */
 
+#define COLOUR_SOURCE_GEOMETRY       0u
+#define COLOUR_SOURCE_SURFACE        1u
+
 #define DEBUG_DISABLE_LIGHTS            0
 #define DEBUG_DISABLE_LIGHT_AMBIENT     0
 #define DEBUG_DISABLE_LIGHT_DIRECTIONAL 0
@@ -66,8 +69,9 @@ layout(std140, binding=1) uniform br_model_state
     float ks; /* Specular mod (doesn't seem to be used by Croc) */
     float kd; /* Diffuse mod */
     float power;
-    uint unlit; /* Is this surface unlit? */
-    bool use_vertex_colour;
+    bool lighting;      /* BRT_LIGHTING_B */
+    bool prelighting;   /* BRT_PRELIGHTING_B */
+    int colour_source;
     int uv_source;
     bool disable_colour_key;
     uint texture_mode;
@@ -223,13 +227,7 @@ void lightingColourSpot(in vec3 p, in vec3 n, in uint i, inout vec3 outA, inout
  */
 void accumulateLights(in vec3 position, in vec3 normal, inout vec3 ambient, inout vec3 diffuse, inout vec3 specular)
 {
-#if DEBUG_DISABLE_LIGHTS
-    diffuse += vec3(1);
-    return;
-#endif
-
-    if(unlit != 0u) {
-        diffuse += vec3(1);
+    if(!lighting) {
         return;
     }
 

drivers/glrend/brender.frag.glsl

@@ -153,8 +153,22 @@ void main()
     accumulateLights(position.xyz, normal, lightA, lightD, lightS);
 #endif
 
-    vec4 vertexColour = use_vertex_colour ? colour : vec4(1);
-    vec4 fragColour = ((vec4(lightA + lightD, 1.0)) * (surface_colour * texColour * vertexColour)) + vec4(lightS, 0.0);
+    vec4 surfaceColour = colour_source == COLOUR_SOURCE_GEOMETRY ? colour : surface_colour;
+
+    /*
+     * If no lighting at all, fullbright baby.
+     */
+    lightD += (!prelighting && !lighting) ? vec3(1) : vec3(0);
+
+#if DEBUG_DISABLE_LIGHTS
+    lightA = vec3(0);
+    lightD = vec3(1);
+    lightS = vec3(0);
+#endif
+
+    vec4 fragColour = vec4(0);
+    fragColour += prelighting ? vec4(colour.rgb, 1) : vec4(0);
+    fragColour += ((vec4(lightA + lightD, 1.0)) * (surfaceColour * texColour)) + vec4(lightS, 0.0);
 
     if(enable_fog) {
         fragColour = applyFog(fragColour, viewDistance);

drivers/glrend/shader_main.h

@@ -84,8 +84,9 @@ typedef struct br_gl_main_data_model {
     alignas(4) float ks;
     alignas(4) float kd;
     alignas(4) float power;
-    alignas(4) uint32_t unlit;
-    alignas(4) uint32_t use_vertex_colour;
+    alignas(4) uint32_t lighting;
+    alignas(4) uint32_t prelighting;
+    alignas(4) uint32_t colour_source;
     alignas(4) uint32_t uv_source;
     alignas(4) uint32_t disable_colour_key;
     alignas(4) uint32_t texture_mode;

drivers/glrend/v1model.c

@@ -212,7 +212,7 @@ static void apply_blend_mode(state_stack *self, const GladGLContext *gl)
     }
 }
 
-static void apply_stored_properties(const GladGLContext *gl, br_renderer *renderer, state_stack *state, uint32_t states, br_boolean *unlit,
+static void apply_stored_properties(const GladGLContext *gl, br_renderer *renderer, state_stack *state, uint32_t states,
                                     br_gl_main_data_model *model, GLuint tex_default)
 {
     br_boolean depth_test = BR_FALSE;
@@ -251,19 +251,22 @@ static void apply_stored_properties(const GladGLContext *gl, br_renderer *render
         }
     }
 
-    *unlit = BR_FALSE;
+    model->lighting    = BR_FALSE;
+    model->prelighting = BR_FALSE;
+
     if(states & MASK_STATE_SURFACE) {
         if(state->surface.colour_source == BRT_SURFACE) {
             br_uint_32 colour = state->surface.colour;
             float      r      = BR_RED(colour) / 255.0f;
             float      g      = BR_GRN(colour) / 255.0f;
             float      b      = BR_BLU(colour) / 255.0f;
             BrVector4Set(&model->surface_colour, r, g, b, state->surface.opacity);
-            model->use_vertex_colour = 0;
+
+            model->colour_source = 1;
         } else {
             ASSERT(state->surface.colour_source == BRT_GEOMETRY);
             BrVector4Set(&model->surface_colour, 1.0f, 1.0f, 1.0f, state->surface.opacity);
-            model->use_vertex_colour = 1;
+            model->colour_source = 0;
         }
 
         model->ka    = state->surface.ka;
@@ -301,7 +304,9 @@ static void apply_stored_properties(const GladGLContext *gl, br_renderer *render
         BrMatrix4Copy23(&model->map_transform, &state->surface.map_transform);
 
         depth_test = !state->surface.force_front && !state->surface.force_back;
-        *unlit     = !state->surface.lighting || state->surface.prelighting;
+
+        model->lighting    = state->surface.lighting;
+        model->prelighting = state->surface.prelighting;
     }
 
     {
@@ -390,10 +395,7 @@ static br_boolean apply_state(br_renderer *renderer, const GladGLContext *gl)
     /* NB: Flag is never set */
     // int model_lit = self->model->flags & V11MODF_LIT;
 
-    unlit = BR_TRUE;
-    apply_stored_properties(gl, renderer, renderer->state.current, MASK_STATE_STORED | MASK_STATE_OUTPUT, &unlit, &model, ctx->tex_white);
-
-    model.unlit = (br_uint_32)unlit;
+    apply_stored_properties(gl, renderer, renderer->state.current, MASK_STATE_STORED | MASK_STATE_OUTPUT, &model, ctx->tex_white);
 
     return BufferRingGLPush(&renderer->model_ring, &model, sizeof(model));
 }