[Mesa-dev] [PATCH 5/6] scons: remove r300g from the build system
Marek Olšák
maraeo at gmail.com
Tue Jun 14 09:25:12 PDT 2011
It's not like anybody needs to build that on Windows.
---
Makefile | 1 -
src/gallium/SConscript | 3 -
src/gallium/drivers/r300/SConscript | 44 ---------------------
src/gallium/targets/dri-r300/SConscript | 26 -------------
src/gallium/targets/egl-static/SConscript | 4 +-
src/gallium/winsys/SConscript | 4 --
src/gallium/winsys/radeon/drm/SConscript | 22 -----------
src/mesa/drivers/dri/r300/compiler/SConscript | 51 -------------------------
8 files changed, 1 insertions(+), 154 deletions(-)
delete mode 100644 src/gallium/drivers/r300/SConscript
delete mode 100644 src/gallium/targets/dri-r300/SConscript
delete mode 100644 src/gallium/winsys/radeon/drm/SConscript
delete mode 100755 src/mesa/drivers/dri/r300/compiler/SConscript
diff --git a/Makefile b/Makefile
index 07ec686..bddfd5d 100644
--- a/Makefile
+++ b/Makefile
@@ -288,7 +288,6 @@ MAIN_FILES = \
$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/Makefile \
- $(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/SConscript \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.def \
$(DIRECTORY)/src/mesa/drivers/x11/Makefile \
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 428bc31..4704dcd 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -26,7 +26,6 @@ if not env['msvc']:
SConscript([
'drivers/i915/SConscript',
'drivers/i965/SConscript',
- 'drivers/r300/SConscript',
])
if env['drm']:
@@ -114,7 +113,6 @@ if env['dri']:
])
if env['drm_radeon']:
SConscript([
- 'targets/dri-r300/SConscript',
'targets/dri-r600/SConscript',
])
@@ -123,7 +121,6 @@ if env['xorg'] and env['drm']:
#'targets/xorg-i915/SConscript',
#'targets/xorg-i965/SConscript',
#'targets/xorg-nouveau/SConscript',
- #'targets/xorg-radeon/SConscript',
'targets/xorg-vmwgfx/SConscript',
])
diff --git a/src/gallium/drivers/r300/SConscript b/src/gallium/drivers/r300/SConscript
deleted file mode 100644
index 3af157a..0000000
--- a/src/gallium/drivers/r300/SConscript
+++ /dev/null
@@ -1,44 +0,0 @@
-Import('*')
-
-r300compiler = SConscript('#/src/mesa/drivers/dri/r300/compiler/SConscript')
-
-env = env.Clone()
-# add the paths for r300compiler
-env.Append(CPPPATH = [
- '#/src/mesa/drivers/dri/r300/compiler',
- '#/include',
- '#/src/mesa',
-])
-
-r300 = env.ConvenienceLibrary(
- target = 'r300',
- source = [
- 'r300_blit.c',
- 'r300_chipset.c',
- 'r300_context.c',
- 'r300_debug.c',
- 'r300_emit.c',
- 'r300_flush.c',
- 'r300_fs.c',
- 'r300_hyperz.c',
- 'r300_query.c',
- 'r300_render.c',
- 'r300_render_stencilref.c',
- 'r300_render_translate.c',
- 'r300_resource.c',
- 'r300_screen.c',
- 'r300_screen_buffer.c',
- 'r300_state.c',
- 'r300_state_derived.c',
- 'r300_vs.c',
- 'r300_vs_draw.c',
- 'r300_texture.c',
- 'r300_texture_desc.c',
- 'r300_tgsi_to_rc.c',
- 'r300_transfer.c',
- ] + r300compiler) + r300compiler
-
-env.Alias('r300', r300)
-
-Export('r300')
-
diff --git a/src/gallium/targets/dri-r300/SConscript b/src/gallium/targets/dri-r300/SConscript
deleted file mode 100644
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/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index cbd98cc..3adc60b 100644
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -104,10 +104,8 @@ if env['drm']:
])
if env['drm_radeon']:
- env.Append(CPPDEFINES = ['_EGL_PIPE_R300', '_EGL_PIPE_R600'])
+ env.Append(CPPDEFINES = ['_EGL_PIPE_R600'])
env.Prepend(LIBS = [
- radeonwinsys,
- r300,
r600winsys,
r600,
])
diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index 9f36d22..986590b 100644
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -35,9 +35,5 @@ if env['dri']:
])
SConscript([
- 'radeon/drm/SConscript',
- ])
-
- SConscript([
'r600/drm/SConscript',
])
diff --git a/src/gallium/winsys/radeon/drm/SConscript b/src/gallium/winsys/radeon/drm/SConscript
deleted file mode 100644
index 39a8c71..0000000
--- a/src/gallium/winsys/radeon/drm/SConscript
+++ /dev/null
@@ -1,22 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-radeon_sources = [
- 'radeon_drm_bo.c',
- 'radeon_drm_cs.c',
- 'radeon_drm_winsys.c',
-]
-
-try:
- env.ParseConfig('pkg-config --cflags libdrm')
-except:
- print 'warning: not building Gallium Radeon'
- Return()
-
-radeonwinsys = env.ConvenienceLibrary(
- target ='radeonwinsys',
- source = radeon_sources,
-)
-
-Export('radeonwinsys')
diff --git a/src/mesa/drivers/dri/r300/compiler/SConscript b/src/mesa/drivers/dri/r300/compiler/SConscript
deleted file mode 100755
index 2c748b6..0000000
--- a/src/mesa/drivers/dri/r300/compiler/SConscript
+++ /dev/null
@@ -1,51 +0,0 @@
-Import('*')
-
-env = env.Clone()
-env.Append(CPPPATH = '#/include')
-env.Append(CPPPATH = '#/src/mesa')
-env.Append(CPPPATH = '#/src/glsl')
-env.Append(CPPPATH = '#/src/mapi')
-
-# temporary fix
-env['CFLAGS'] = str(env['CFLAGS']).replace('-Werror=declaration-after-statement', '')
-
-r300compiler = env.ConvenienceLibrary(
- target = 'r300compiler',
- source = [
- 'radeon_code.c',
- 'radeon_compiler.c',
- 'radeon_compiler_util.c',
- 'radeon_program.c',
- 'radeon_program_print.c',
- 'radeon_opcodes.c',
- 'radeon_program_alu.c',
- 'radeon_program_pair.c',
- 'radeon_program_tex.c',
- 'radeon_pair_translate.c',
- 'radeon_pair_schedule.c',
- 'radeon_pair_regalloc.c',
- 'radeon_pair_dead_sources.c',
- 'radeon_optimize.c',
- 'radeon_remove_constants.c',
- 'radeon_rename_regs.c',
- 'radeon_emulate_branches.c',
- 'radeon_emulate_loops.c',
- 'radeon_dataflow.c',
- 'radeon_dataflow_deadcode.c',
- 'radeon_dataflow_swizzles.c',
- 'radeon_variable.c',
- 'radeon_list.c',
- 'r3xx_fragprog.c',
- 'r300_fragprog.c',
- 'r300_fragprog_swizzle.c',
- 'r300_fragprog_emit.c',
- 'r500_fragprog.c',
- 'r500_fragprog_emit.c',
- 'r3xx_vertprog.c',
- 'r3xx_vertprog_dump.c',
- 'memory_pool.c',
- '#/src/glsl/ralloc.c',
- '#/src/mesa/program/register_allocate.c'
- ])
-
-Return('r300compiler')
--
1.7.4.1
More information about the mesa-dev
mailing list