gallium: always save and restore vertex buffers using cso_cache

[mesa.git] / src / gallium / state_trackers / xorg / SConscript

diff --git a/src/gallium/state_trackers/xorg/SConscript b/src/gallium/state_trackers/xorg/SConscript
index 6165bae7a4ba2400eb134a214a1eb60151dd0947..19315694b7cd34bcba77a9fe148be3c3efce7033 100644 (file)
--- a/src/gallium/state_trackers/xorg/SConscript
+++ b/src/gallium/state_trackers/xorg/SConscript
@@ -3,26 +3,38 @@
 
 Import('*')
 
-if 'xorg' in env['statetrackers']:
-
-    env = env.Clone()
-
-    env.Append(CPPPATH = [
-       '#/src/mesa',
-    ])
-
-    env.ParseConfig('pkg-config --cflags --libs xorg-server')
-
-    st_xorg = env.ConvenienceLibrary(
-       target = 'st_xorg',
-       source = [ 'xorg_composite.c',
-               'xorg_crtc.c',
-               'xorg_dri2.c',
-               'xorg_driver.c',
-               'xorg_exa.c',
-               'xorg_exa_tgsi.c',
-               'xorg_output.c',
-               'xorg_xv.c',
-               ]
-    )
-    Export('st_xorg')
+env = env.Clone()
+
+env.Append(CPPPATH = [
+    '#/src/mesa',
+])
+
+env.ParseConfig('pkg-config --cflags --libs libdrm xorg-server')
+
+if env['kms']:
+    env.Append(CPPDEFINES = ['HAVE_LIBKMS'])
+
+conf = env.Configure()
+
+if conf.CheckHeader('X11/extensions/dpmsconst.h'):
+    env.Append(CPPDEFINES = [('HAVE_XEXTPROTO_71', '1')])
+
+conf.Finish()
+
+sources = [
+    'xorg_composite.c',
+    'xorg_crtc.c',
+    'xorg_dri2.c',
+    'xorg_driver.c',
+    'xorg_exa.c',
+    'xorg_exa_tgsi.c',
+    'xorg_output.c',
+    'xorg_renderer.c',
+    'xorg_xv.c',
+]
+
+st_xorg = env.ConvenienceLibrary(
+    target = 'st_xorg',
+    source = sources,
+)
+Export('st_xorg')