8 files changed, 35 insertions, 15 deletions

diff --git a/src/llr/light.c b/src/llr/light.c
index 1d1c40d..0fa1522 100644
--- a/src/llr/light.c
+++ b/src/llr/light.c
@@ -1,7 +1,7 @@
 #include "light_impl.h"
 
-#include "../scene/node_impl.h"
-#include "../scene/scene_memory.h"
+#include "memory.h"
+#include "scene/node_impl.h"
 
 #include <error.h>
 
diff --git a/src/llr/light_impl.h b/src/llr/light_impl.h
index 32203c4..5ec8145 100644
--- a/src/llr/light_impl.h
+++ b/src/llr/light_impl.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <../../include/gfx/llr/light.h>
+#include <gfx/llr/light.h>
 
-#include "../scene/types.h"
+#include "scene/types.h"
 
 typedef struct Texture Texture;
 
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);
 }
 
diff --git a/src/llr/llr_impl.h b/src/llr/llr_impl.h
index ada2d79..3f6a68f 100644
--- a/src/llr/llr_impl.h
+++ b/src/llr/llr_impl.h
@@ -43,6 +43,7 @@ typedef struct LLR {
       bool camera_changed   : 1; // Whether the camera parameters have changed.
       bool lights_changed   : 1; // Whether the lights have changed.
       bool skeleton_changed : 1; // Whether the skeleton has changed.
+      bool material_changed : 1; // Whether the material has changed.
       bool matrix_changed   : 1; // Whether the matrix stack has changed.
     };
     uint8_t changed_flags;
@@ -53,6 +54,8 @@ typedef struct LLR {
 
   ShaderProgram* shader; // Active shader. Not owned.
 
+  const Material* material; // Active material. Not owned.
+
   vec3 camera_position;
   mat4 camera_rotation;
   mat4 view;       // Camera view matrix.
diff --git a/src/llr/material.c b/src/llr/material.c
index 4014482..f09dd3f 100644
--- a/src/llr/material.c
+++ b/src/llr/material.c
@@ -1,6 +1,6 @@
 #include "material_impl.h"
 
-#include "../scene/scene_memory.h"
+#include "memory.h"
 
 #include <gfx/core.h>
 
diff --git a/src/llr/material_impl.h b/src/llr/material_impl.h
index 138497f..2b7cd89 100644
--- a/src/llr/material_impl.h
+++ b/src/llr/material_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <../../include/gfx/llr/material.h>
+#include <gfx/llr/material.h>
 
 typedef struct ShaderProgram ShaderProgram;
 
diff --git a/src/llr/mesh.c b/src/llr/mesh.c
index 3aebb04..5f9e5d0 100644
--- a/src/llr/mesh.c
+++ b/src/llr/mesh.c
@@ -1,6 +1,6 @@
 #include "mesh_impl.h"
 
-#include "../scene/scene_memory.h"
+#include "memory.h"
 
 #include <assert.h>
 
diff --git a/src/llr/mesh_impl.h b/src/llr/mesh_impl.h
index 47ff525..96e60df 100644
--- a/src/llr/mesh_impl.h
+++ b/src/llr/mesh_impl.h
@@ -1,12 +1,9 @@
 #pragma once
 
-#include <../../include/gfx/llr/mesh.h>
+#include <gfx/llr/mesh.h>
 
 typedef struct Mesh {
   const Geometry* geometry;
   const Material* material;
   ShaderProgram*  shader;
 } Mesh;
-
-// TODO: a mesh_render() that takes a transform, applies the material and the
-// transform, and then renders the geometry.