1 files changed, 24 insertions, 4 deletions

diff --git a/src/llr/llr.c b/src/llr/llr.c
index 74cfaed..664c9a4 100644
--- a/src/llr/llr.c
+++ b/src/llr/llr.c
@@ -36,11 +36,14 @@ static bool init_ibl(LLR* renderer) {
   return true;
 }
 
-// TODO: Why is this done lazily here? Do it when the environment light is
-//  created.
-//
 /// Compute irradiance and prefiltered environment maps for the light if they
 /// have not been already computed.
+///
+/// This is done lazily here, and not when the light is created, because we
+/// need an IBL instance to do this and it is more convenient for the public
+/// API to create lights without worrying about those details. It also makes the
+/// public API cheaper, since the maps are only computed when they are actually
+/// needed.
 static bool set_up_environment_light(LLR* renderer, EnvironmentLight* light) {
   assert(renderer);
   assert(light);
@@ -198,11 +201,20 @@ static void configure_state(LLR* renderer) {
     }
   }
 
+  if (renderer->material_changed || renderer->shader_changed) {
+    renderer->material_changed = false;
+
+    gfx_material_activate(renderer->shader, renderer->material);
+  }
+
   if (renderer->shader_changed) {
     renderer->shader_changed = false;
     gfx_activate_shader_program(renderer->shader);
   }
 
+  // TODO: At present, this results in many redundant calls to
+  //  glGetUniformLocation() and glUniformXyz(). Look at the trace.
+  //
   // Must be called after activating the program.
   gfx_apply_uniforms(renderer->shader);
 }
@@ -293,6 +305,14 @@ void gfx_llr_clear_skeleton(LLR* renderer) {
   renderer->skeleton_changed = true;
 }
 
+void gfx_llr_set_material(LLR* renderer, const Material* material) {
+  assert(renderer);
+  assert(material);
+
+  renderer->material         = material;
+  renderer->material_changed = true;
+}
+
 void gfx_llr_set_camera(LLR* renderer, const Camera* camera) {
   assert(renderer);
 
@@ -328,7 +348,7 @@ void gfx_llr_render_mesh(LLR* renderer, const Mesh* mesh) {
   assert(mesh->geometry);
   assert(mesh->material);
 
-  gfx_material_activate(renderer->shader, mesh->material);
+  gfx_llr_set_material(renderer, mesh->material);
   gfx_llr_render_geometry(renderer, mesh->geometry);
 }