scons: remove radeon build

One build system for linux/unix only drivers should be enough.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48694

Acked-by: Jose Fonseca <jfonseca@vmware.com>

diff --git a/scons/gallium.py b/scons/gallium.py
index 7eb515edfcad314694f782690defb29318f9dd8c..2e341e99f83176ea27d18180088340bdbeb54c85 100755 (executable)
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -535,7 +535,6 @@ def generate(env):
     env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
     env.PkgCheckModules('DRM', ['libdrm >= 2.4.24'])
     env.PkgCheckModules('DRM_INTEL', ['libdrm_intel >= 2.4.30'])
-    env.PkgCheckModules('DRM_RADEON', ['libdrm_radeon >= 2.4.42'])
     env.PkgCheckModules('XORG', ['xorg-server >= 1.6.0'])
     env.PkgCheckModules('KMS', ['libkms >= 2.4.24'])
     env.PkgCheckModules('UDEV', ['libudev > 150'])

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index f281f4c6567dc39f37dc0f160ccf8a145415e63c..c53cd391b1f7dcb4e17cd2f06b196de5b9ccd175 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -29,15 +29,6 @@ if not env['msvc']:
 
 if env['drm']:
     # These drivers depend on drm headers
-    if env['drm_radeon']:
-        SConscript([
-            'drivers/r300/SConscript',
-            'drivers/r600/SConscript',
-        ])
-        if env['llvm']:
-            SConscript([
-                'drivers/radeonsi/SConscript',
-            ])
     # XXX: nouveau drivers have a tight dependency on libdrm, so to enable
     # we need some version logic before we enable them. Also, ATM there is
     # no nouveau target in scons
@@ -110,11 +101,6 @@ if env['dri']:
             'winsys/i915/drm/SConscript',
         ])
 
-    if env['drm_radeon']:
-        SConscript([
-            'winsys/radeon/drm/SConscript',
-        ])
-
 #
 # Targets
 #
@@ -152,21 +138,11 @@ if not env['embedded']:
             SConscript([
                 'targets/dri-i915/SConscript',
             ])
-        if env['drm_radeon']:
-            SConscript([
-                'targets/dri-r300/SConscript',
-                'targets/dri-r600/SConscript',
-            ])
-            if env['llvm']:
-                SConscript([
-                    'targets/dri-radeonsi/SConscript',
-                ])
 
     if env['xorg'] and env['drm']:
         SConscript([
             #'targets/xorg-i915/SConscript',
             #'targets/xorg-nouveau/SConscript',
-            #'targets/xorg-radeon/SConscript',
         ])
 
 

diff --git a/src/gallium/drivers/r300/SConscript b/src/gallium/drivers/r300/SConscript
deleted file mode 100644 (file)
index 7ff0732..0000000
--- a/src/gallium/drivers/r300/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-env.PkgUseModules('DRM_RADEON')
-
-env.Append(CPPPATH = [
-    '#/include', 
-    '#/src/mesa',
-    '#/src/glsl',
-    '#/src/mapi',
-])
-
-r300 = env.ConvenienceLibrary(
-    target = 'r300',
-    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') + [
-        '#/src/glsl/ralloc.c',
-        '#/src/mesa/program/register_allocate.c'
-    ])
-
-env.Alias('r300', r300)
-
-Export('r300')
-

diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript
deleted file mode 100644 (file)
index 658be50..0000000
--- a/src/gallium/drivers/r600/SConscript
+++ /dev/null
@@ -1,18 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-env.PkgUseModules('DRM_RADEON')
-
-env.Append(CPPPATH = [
-    '#/include',
-])
-
-r600 = env.ConvenienceLibrary(
-    target = 'r600',
-    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
-    )
-
-env.Alias('r600', r600)
-
-Export('r600')

diff --git a/src/gallium/drivers/radeonsi/SConscript b/src/gallium/drivers/radeonsi/SConscript
deleted file mode 100644 (file)
index f2d2bec..0000000
--- a/src/gallium/drivers/radeonsi/SConscript
+++ /dev/null
@@ -1,17 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
-    '#/include',
-    '#/src/gallium/drivers/radeon',
-])
-
-radeonsi = env.ConvenienceLibrary(
-    target = 'radeonsi',
-    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
-    )
-
-env.Alias('radeonsi', radeonsi)
-
-Export('radeonsi')

diff --git a/src/gallium/targets/dri-r300/SConscript b/src/gallium/targets/dri-r300/SConscript
deleted file mode 100644 (file)
index 683b6c6..0000000
--- a/src/gallium/targets/dri-r300/SConscript
+++ /dev/null
@@ -1,26 +0,0 @@
-Import('*')
-
-env = drienv.Clone()
-
-env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD'])
-
-env.Prepend(LIBS = [
-    st_dri,
-    radeonwinsys,
-    r300,
-    galahad,
-    trace,
-    rbug,
-    mesa,
-    glsl,
-    gallium,
-    COMMON_DRI_DRM_OBJECTS
-])
-
-module = env.SharedLibrary(
-    target ='r300_dri.so',
-    source = 'target.c',
-    SHLIBPREFIX = '',
-)
-
-env.Alias('dri-r300', module)
\ No newline at end of file

diff --git a/src/gallium/targets/dri-r600/SConscript b/src/gallium/targets/dri-r600/SConscript
deleted file mode 100644 (file)
index d93ceb3..0000000
--- a/src/gallium/targets/dri-r600/SConscript
+++ /dev/null
@@ -1,28 +0,0 @@
-Import('*')
-
-env = drienv.Clone()
-
-env.PkgUseModules('DRM')
-env.PkgUseModules('DRM_RADEON')
-
-env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
-
-env.Prepend(LIBS = [
-    st_dri,
-    radeonwinsys,
-    r600,
-    trace,
-    rbug,
-    mesa,
-    glsl,
-    gallium,
-    COMMON_DRI_DRM_OBJECTS
-])
-
-module = env.SharedLibrary(
-    target ='r600_dri.so',
-    source = 'target.c',
-    SHLIBPREFIX = '',
-)
-
-env.Alias('dri-r600', module)

diff --git a/src/gallium/targets/dri-radeonsi/SConscript b/src/gallium/targets/dri-radeonsi/SConscript
deleted file mode 100644 (file)
index 2b5c151..0000000
--- a/src/gallium/targets/dri-radeonsi/SConscript
+++ /dev/null
@@ -1,25 +0,0 @@
-Import('*')
-
-env = drienv.Clone()
-
-env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
-
-env.Prepend(LIBS = [
-    st_dri,
-    radeonwinsys,
-    radeonsi,
-    trace,
-    rbug,
-    mesa,
-    glsl,
-    gallium,
-    COMMON_DRI_DRM_OBJECTS
-])
-
-module = env.SharedLibrary(
-    target ='radeonsi_dri.so',
-    source = 'target.c',
-    SHLIBPREFIX = '',
-)
-
-env.Alias('dri-radeonsi', module)

diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index 1c7ddd418428253222d74e7efaa31a232f32dc2b..b4ccc5b805a17ddf2cdd4b78326d17c1aa74d622 100644 (file)
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -98,15 +98,6 @@ if env['HAVE_DRM']:
             ws_wrapper,
         ])
 
-    if env['HAVE_DRM_RADEON']:
-        env.PkgUseModules('DRM_RADEON')
-        env.Append(CPPDEFINES = ['_EGL_PIPE_R300', '_EGL_PIPE_R600'])
-        env.Prepend(LIBS = [
-            radeonwinsys,
-            r300,
-            r600,
-        ])
-
     env.Append(CPPDEFINES = ['_EGL_PIPE_VMWGFX'])
     env.Prepend(LIBS = [
         svgadrm,

diff --git a/src/gallium/winsys/radeon/drm/SConscript b/src/gallium/winsys/radeon/drm/SConscript
deleted file mode 100644 (file)
index 8edd97b..0000000
--- a/src/gallium/winsys/radeon/drm/SConscript
+++ /dev/null
@@ -1,14 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-radeon_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
-
-env.PkgUseModules('DRM_RADEON')
-
-radeonwinsys = env.ConvenienceLibrary(
-    target ='radeonwinsys',
-    source = radeon_sources,
-)
-
-Export('radeonwinsys')