---
src/gallium/SConscript | 11 +--------
src/gallium/drivers/r600/SConscript | 37 -----------------------------
src/gallium/targets/dri-r600/SConscript | 25 -------------------
src/gallium/targets/egl-static/SConscript | 7 -----
src/gallium/winsys/SConscript | 4 ---
src/gallium/winsys/r600/drm/SConscript | 29 ----------------------
6 files changed, 1 insertions(+), 112 deletions(-)
delete mode 100644 src/gallium/drivers/r600/SConscript
delete mode 100644 src/gallium/targets/dri-r600/SConscript
delete mode 100644 src/gallium/winsys/r600/drm/SConscript
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 4704dcd..57d2b4e 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -28,12 +28,7 @@ if not env['msvc']:
'drivers/i965/SConscript',
])
-if env['drm']:
- # These drivers depend on drm headers
- if env['drm_radeon']:
- SConscript([
- 'drivers/r600/SConscript',
- ])
+#if env['drm']:
# 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
@@ -111,10 +106,6 @@ if env['dri']:
'targets/dri-i915/SConscript',
'targets/dri-i965/SConscript',
])
- if env['drm_radeon']:
- SConscript([
- 'targets/dri-r600/SConscript',
- ])
if env['xorg'] and env['drm']:
SConscript([
diff --git a/src/gallium/drivers/r600/SConscript
b/src/gallium/drivers/r600/SConscript
deleted file mode 100644
index 0135808..0000000
--- a/src/gallium/drivers/r600/SConscript
+++ /dev/null
@@ -1,37 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-try:
- env.ParseConfig('pkg-config --cflags libdrm_radeon')
-except OSError:
- print 'warning: not building r600'
- Return()
-
-env.Append(CPPPATH = [
- '#/include',
- '#/src/mesa',
-])
-
-r600 = env.ConvenienceLibrary(
- target = 'r600',
- source = [
- 'r600_asm.c',
- 'r600_buffer.c',
- 'r600_blit.c',
- 'r600_pipe.c',
- 'r600_query.c',
- 'r600_resource.c',
- 'r600_shader.c',
- 'r600_state.c',
- 'r600_state_common.c',
- 'r600_texture.c',
- 'r600_translate.c',
- 'r700_asm.c',
- 'evergreen_state.c',
- 'eg_asm.c',
- ])
-
-env.Alias('r600', r600)
-
-Export('r600')
diff --git a/src/gallium/targets/dri-r600/SConscript
b/src/gallium/targets/dri-r600/SConscript
deleted file mode 100644
index 1df11a8..0000000
--- a/src/gallium/targets/dri-r600/SConscript
+++ /dev/null
@@ -1,25 +0,0 @@
-Import('*')
-
-env = drienv.Clone()
-
-env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
-
-env.Prepend(LIBS = [
- st_dri,
- r600winsys,
- 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/egl-static/SConscript
b/src/gallium/targets/egl-static/SConscript
index 3adc60b..2c236ab 100644
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -103,13 +103,6 @@ if env['drm']:
ws_wrapper,
])
- if env['drm_radeon']:
- env.Append(CPPDEFINES = ['_EGL_PIPE_R600'])
- env.Prepend(LIBS = [
- r600winsys,
- r600,
- ])
-
env.Append(CPPDEFINES = ['_EGL_PIPE_VMWGFX'])
env.Prepend(LIBS = [
svgadrm,
diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index 986590b..edfa842 100644
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -33,7 +33,3 @@ if env['dri']:
SConscript([
'i965/drm/SConscript',
])
-
- SConscript([
- 'r600/drm/SConscript',
- ])
diff --git a/src/gallium/winsys/r600/drm/SConscript
b/src/gallium/winsys/r600/drm/SConscript
deleted file mode 100644
index cc9a06a..0000000
--- a/src/gallium/winsys/r600/drm/SConscript
+++ /dev/null
@@ -1,29 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-r600_sources = [
- 'bof.c',
- 'evergreen_hw_context.c',
- 'radeon_bo.c',
- 'radeon_pciid.c',
- 'r600_bo.c',
- 'r600_drm.c',
- 'r600_hw_context.c',
- 'r600_bomgr.c',
-]
-
-try:
- env.ParseConfig('pkg-config --cflags libdrm_radeon')
-except OSError:
- print 'warning: not building r600g'
- Return()
-
-env.Append(CPPPATH = '#/src/gallium/drivers/r600')
-
-r600winsys = env.ConvenienceLibrary(
- target ='r600winsys',
- source = r600_sources,
-)
-
-Export('r600winsys')
--
1.7.4.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
