4 files changed, 7 insertions, 7 deletions

diff --git a/gfx/src/scene/material.c b/gfx/src/scene/material.c
index d44746a..e5856d0 100644
--- a/gfx/src/scene/material.c
+++ b/gfx/src/scene/material.c
@@ -8,7 +8,6 @@ static void material_make(Material* material, const MaterialDesc* desc) {
   assert(material);
   assert(desc);
   assert(desc->num_uniforms < GFX_MAX_UNIFORMS_PER_MATERIAL);
-  material->shader = desc->shader;
   material->num_uniforms = desc->num_uniforms;
   for (int i = 0; i < desc->num_uniforms; ++i) {
     material->uniforms[i] = desc->uniforms[i];
@@ -47,11 +46,10 @@ static void set_uniform(ShaderProgram* prog, const ShaderUniform* uniform) {
   }
 }
 
-void material_activate(const Material* material) {
+void material_activate(ShaderProgram* shader, const Material* material) {
   assert(material);
-  gfx_activate_shader_program(material->shader);
   for (int i = 0; i < material->num_uniforms; ++i) {
     const ShaderUniform* uniform = &material->uniforms[i];
-    set_uniform(material->shader, uniform);
+    set_uniform(shader, uniform);
   }
 }
diff --git a/gfx/src/scene/material_impl.h b/gfx/src/scene/material_impl.h
index c680ccf..a6aa95b 100644
--- a/gfx/src/scene/material_impl.h
+++ b/gfx/src/scene/material_impl.h
@@ -5,13 +5,12 @@
 typedef struct ShaderProgram ShaderProgram;
 
 typedef struct Material {
-  ShaderProgram* shader;
   ShaderUniform uniforms[GFX_MAX_UNIFORMS_PER_MATERIAL];
-  int num_uniforms;
+  int           num_uniforms;
 } Material;
 
 /// Activate the material.
 ///
 /// This activates the material's shader and configures the shader uniforms that
 /// are specific to the material.
-void material_activate(const Material* material);
+void material_activate(ShaderProgram* shader, const Material* material);
diff --git a/gfx/src/scene/mesh.c b/gfx/src/scene/mesh.c
index 722eae7..689105c 100644
--- a/gfx/src/scene/mesh.c
+++ b/gfx/src/scene/mesh.c
@@ -9,8 +9,10 @@ static void mesh_make(Mesh* mesh, const MeshDesc* desc) {
   assert(desc);
   assert(desc->geometry);
   assert(desc->material);
+  assert(desc->shader);
   mesh->geometry = desc->geometry;
   mesh->material = desc->material;
+  mesh->shader   = desc->shader;
 }
 
 Mesh* gfx_make_mesh(const MeshDesc* desc) {
diff --git a/gfx/src/scene/mesh_impl.h b/gfx/src/scene/mesh_impl.h
index 858b147..560b77e 100644
--- a/gfx/src/scene/mesh_impl.h
+++ b/gfx/src/scene/mesh_impl.h
@@ -5,6 +5,7 @@
 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