r600/sfn: Sort uniforms by binding and offset

[mesa.git] / src / gallium / SConscript

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 8be84cddbe727df6187556b9fdda6a12bb31633c..98ba88588d54d516570f31c124fa42f407d5edf7 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,38 +1,56 @@
-import os
+Import('env')
 
-Import('*')
+#
+# Auxiliary modules
+#
 
-env = env.Clone()
+SConscript('auxiliary/SConscript')
+SConscript('auxiliary/pipe-loader/SConscript')
 
-auxiliaries = []
-
-Export('auxiliaries')
-
-
-if llvm:
-       SConscript(['auxiliary/gallivm/SConscript'])
+#
+# Drivers
+#
 
+# These are common and work across all platforms
 SConscript([
-       # NOTE: order matters!
-       'auxiliary/util/SConscript',
-       'auxiliary/rtasm/SConscript',
-       'auxiliary/tgsi/SConscript',
-       'auxiliary/cso_cache/SConscript',
-       'auxiliary/translate/SConscript',
-       'auxiliary/draw/SConscript',
-       'auxiliary/pipebuffer/SConscript',
-       'auxiliary/indices/SConscript',
-       'auxiliary/rbug/SConscript',
-       'auxiliary/vl/SConscript',
+    'drivers/llvmpipe/SConscript',
+    'drivers/softpipe/SConscript',
+    'drivers/svga/SConscript',
 ])
 
-for driver in env['drivers']:
-       SConscript(os.path.join('drivers', driver, 'SConscript'))
+#
+# Winsys
+#
 
-SConscript('state_trackers/python/SConscript')
-SConscript('state_trackers/glx/xlib/SConscript')
-SConscript('state_trackers/dri/SConscript')
-SConscript('state_trackers/xorg/SConscript')
+SConscript([
+    'winsys/sw/null/SConscript',
+    'winsys/sw/wrapper/SConscript',
+])
 
-if platform == 'windows':
-       SConscript('state_trackers/wgl/SConscript')
+if env['x11']:
+    SConscript([
+        'winsys/sw/xlib/SConscript',
+    ])
+
+if env['platform'] == 'windows':
+    SConscript([
+        'winsys/sw/gdi/SConscript',
+    ])
+
+
+#
+# Frontends and targets
+#
+
+if not env['embedded']:
+    if env['x11']:
+        SConscript([
+            'frontends/glx/xlib/SConscript',
+            'targets/libgl-xlib/SConscript',
+        ])
+
+    if env['platform'] == 'windows':
+        SConscript([
+            'frontends/wgl/SConscript',
+            'targets/libgl-gdi/SConscript',
+        ])