diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/SConscript | 24 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/SConscript | 24 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/SConscript | 18 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/SConscript | 17 | ||||
| -rw-r--r-- | src/gallium/targets/dri-r300/SConscript | 26 | ||||
| -rw-r--r-- | src/gallium/targets/dri-r600/SConscript | 28 | ||||
| -rw-r--r-- | src/gallium/targets/dri-radeonsi/SConscript | 25 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/SConscript | 9 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/SConscript | 14 |
9 files changed, 0 insertions, 185 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript index f281f4c6567..c53cd391b1f 100644 --- 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 index 7ff073205f6..00000000000 --- 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 index 658be500dc1..00000000000 --- 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 index f2d2bec6e42..00000000000 --- 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 index 683b6c6972d..00000000000 --- 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 index d93ceb3cee2..00000000000 --- 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 index 2b5c151fba6..00000000000 --- 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 1c7ddd41842..b4ccc5b805a 100644 --- 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 index 8edd97b24fb..00000000000 --- 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') |