r600g: Integrate into build

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>

diff --git a/SConstruct b/SConstruct
index 5c72323d839110ba9b726ba9d22de1d8fce66838..1d41fc57dd9d405e2947f64317feceba25ac19d9 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -51,9 +51,9 @@ common.AddOptions(opts)
 opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
                      ['mesa', 'python', 'xorg']))
 opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe', 'nouveau', 'nv50', 'nvfx']))
+                     ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'r600', 'identity', 'llvmpipe', 'nouveau', 'nv50', 'nvfx']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'graw-xlib']))
+                     ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'r600', 'graw-xlib']))
 
 opts.Add(ListVariable('targets', 'driver targets to build', default_targets,
                      ['dri-i915',

diff --git a/configure.ac b/configure.ac
index 3d8da6c979bc41d538739a9794a35e013ad648a5..db4f6d740e509daf18c320837255e0c790e4d1d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1509,6 +1509,19 @@ elif test "x$enable_gallium_radeon" = xauto; then
     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
 fi
 
+dnl
+dnl Gallium Radeon r600g configuration
+dnl
+AC_ARG_ENABLE([gallium-r600],
+    [AS_HELP_STRING([--enable-gallium-r600],
+        [build gallium radeon @<:@default=disabled@:>@])],
+    [enable_gallium_r600="$enableval"],
+    [enable_gallium_r600=auto])
+if test "x$enable_gallium_r600" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
+    gallium_check_st "r600/drm" "dri-r600"
+fi
+
 dnl
 dnl Gallium Nouveau configuration
 dnl

diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript
index 26d95bb766d65e250a0133b9c6224b13181cdc24..8c9edd897b2dd1e8c686c4c57b02782e0e22bf92 100644 (file)
--- a/src/gallium/drivers/r600/SConscript
+++ b/src/gallium/drivers/r600/SConscript
@@ -1,6 +1,9 @@
 Import('*')
 
 env = env.Clone()
+
+env.ParseConfig('pkg-config --cflags libdrm_radeon')
+
 env.Append(CPPPATH = [
     '#/include', 
     '#/src/mesa',

diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index 4bbb16c227244db1e00fd4cfb082555461bb35c2..74b53e5023f8fe364e847119d7adc713ffbd61c3 100644 (file)
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -99,3 +99,8 @@ if 'radeon' in env['winsys']:
        SConscript([
                'dri-radeong/SConscript',
        ])
+
+if 'r600' in env['winsys']:
+       SConscript([
+               'dri-r600/SConscript',
+       ])

diff --git a/src/gallium/targets/dri-r600/SConscript b/src/gallium/targets/dri-r600/SConscript
index 24eb5f0758ccb9c04fad3dfae704447f052d2ac8..417c289ea0f4bd359a8cf25dfe5843db8f2e646e 100644 (file)
--- a/src/gallium/targets/dri-r600/SConscript
+++ b/src/gallium/targets/dri-r600/SConscript
@@ -10,7 +10,7 @@ env.ParseConfig('pkg-config --cflags --libs libdrm_radeon')
 
 env.Prepend(LIBS = [
     st_dri,
-    r600winsys,
+    r600drm,
     r600,
     trace,
     mesa,

diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index 330b1ab834ceaf113e48715c918fda170fd0247f..907ac90bf04c323c8f1c116ddf5ee7d61befaf22 100644 (file)
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -40,3 +40,8 @@ if env['dri']:
                SConscript([
                        'radeon/drm/SConscript',
                ])
+
+       if 'r600' in env['winsys']:
+               SConscript([
+                       'r600/drm/SConscript',
+               ])