Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / auxiliary / SConscript

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index 4b9059d9aa3a56ff34f7232be4aa79871df0f297..e6806d9a723160138b81c9b0f58baacd1e0aeb5a 100644 (file)
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -175,13 +175,13 @@ source = [
     'util/u_linkage.c',
     'util/u_network.c',
     'util/u_math.c',
-    'util/u_mempool.c',
     'util/u_mm.c',
     'util/u_rect.c',
     'util/u_resource.c',
     'util/u_ringbuffer.c',
     'util/u_sampler.c',
     'util/u_simple_shaders.c',
+    'util/u_slab.c',
     'util/u_snprintf.c',
     'util/u_staging.c',
     'util/u_surface.c',