1 files changed, 6 insertions, 1 deletions

diff --git a/src/llr/llr.c b/src/llr/llr.c
index 664c9a4..fe02c0d 100644
--- a/src/llr/llr.c
+++ b/src/llr/llr.c
@@ -215,6 +215,10 @@ static void configure_state(LLR* renderer) {
   // TODO: At present, this results in many redundant calls to
   //  glGetUniformLocation() and glUniformXyz(). Look at the trace.
   //
+  // TODO: Could add to qapitrace functionality to detect redundant calls and
+  //  other inefficiencies. Maybe ask in the Github first if there would be
+  //  interest in this.
+  //
   // Must be called after activating the program.
   gfx_apply_uniforms(renderer->shader);
 }
@@ -343,12 +347,13 @@ void gfx_llr_render_geometry(LLR* renderer, const Geometry* geometry) {
 
 void gfx_llr_render_mesh(LLR* renderer, const Mesh* mesh) {
   assert(renderer);
-  assert(renderer->shader);
   assert(mesh);
   assert(mesh->geometry);
   assert(mesh->material);
+  assert(mesh->shader);
 
   gfx_llr_set_material(renderer, mesh->material);
+  gfx_llr_set_shader(renderer, mesh->shader);
   gfx_llr_render_geometry(renderer, mesh->geometry);
 }