From 99f11d0e18e1ff5a433c84d52ffc13b9684c2650 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Mon, 8 Mar 2010 19:11:35 +0000 Subject: gallium: introduce target directory Currently there are still at least two functions bundled up inside the winsys concept: a) that of a backend resource manager, sometimes capable of performing present() operations, b) the initialization code/routine for the whole driver stack. The inclusion of (b) makes it difficult to share implementations of (a) between different drivers. For instance, a clean xlib winsys could be of use for software-rasterized VG, GLES, EGL, etc, stacks. But that is only true as long as there is no dependency from the winsys to higher level code, as would be the case when we include (b) in this component. This change creates a new gallium/targets subtree, specifically for implementing the glue needed to build individual driver stacks, and moves that code out of a single example winsys, namely xlib. Other drivers continue to build unchanged, but hopefully can migrate to this structure over time. --- src/gallium/targets/SConscript | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/gallium/targets/SConscript (limited to 'src/gallium/targets/SConscript') diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript new file mode 100644 index 0000000000..46cbe656f4 --- /dev/null +++ b/src/gallium/targets/SConscript @@ -0,0 +1,16 @@ +Import('*') + +#if env['dri']: +# SConscript([ +# 'drm/SConscript', +# ]) + +if 'xlib' in env['winsys']: + SConscript([ + 'libgl-xlib/SConscript', + ]) + +#if 'gdi' in env['winsys']: +# SConscript([ +# 'gdi/SConscript', +# ]) -- cgit v1.2.3 From 706eda30578cbdd1456c09ccc2a570a5d6a99c92 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Tue, 9 Mar 2010 15:07:57 +0000 Subject: scons: Add new targets option. This will likely change. Most probably we'll just add an alias to indvidual targets and use the regular scons targets arguments. --- SConstruct | 2 ++ src/SConscript | 9 ++++----- src/gallium/SConscript | 4 ++++ src/gallium/targets/SConscript | 2 +- src/gallium/winsys/xlib/SConscript | 16 ++++++++-------- 5 files changed, 19 insertions(+), 14 deletions(-) (limited to 'src/gallium/targets/SConscript') diff --git a/SConstruct b/SConstruct index e1c4a1898c..4cadd01363 100644 --- a/SConstruct +++ b/SConstruct @@ -53,6 +53,8 @@ opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers, ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe'])) opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys, ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon'])) +opts.Add(ListVariable('targets', 'target drivers to build', 'all', + ['xlib'])) opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) diff --git a/src/SConscript b/src/SConscript index cd4896ada4..cf6db730da 100644 --- a/src/SConscript +++ b/src/SConscript @@ -1,13 +1,12 @@ Import('*') SConscript('glsl/SConscript') -SConscript('gallium/SConscript') if 'mesa' in env['statetrackers']: - SConscript('mesa/SConscript') + SConscript('mesa/SConscript') -SConscript('gallium/winsys/SConscript') +SConscript('gallium/SConscript') if platform != 'embedded': - SConscript('glut/glx/SConscript') - SConscript('glew/SConscript') + SConscript('glut/glx/SConscript') + SConscript('glew/SConscript') diff --git a/src/gallium/SConscript b/src/gallium/SConscript index d56c5c8461..ba541f9636 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -15,3 +15,7 @@ if platform != 'embedded': if platform == 'windows': SConscript('state_trackers/wgl/SConscript') + +SConscript('winsys/SConscript') + +SConscript('targets/SConscript') diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript index 46cbe656f4..266d705f89 100644 --- a/src/gallium/targets/SConscript +++ b/src/gallium/targets/SConscript @@ -5,7 +5,7 @@ Import('*') # 'drm/SConscript', # ]) -if 'xlib' in env['winsys']: +if 'xlib' in env['targets']: SConscript([ 'libgl-xlib/SConscript', ]) diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript index 587cdb8e38..1a1879f128 100644 --- a/src/gallium/winsys/xlib/SConscript +++ b/src/gallium/winsys/xlib/SConscript @@ -15,13 +15,13 @@ if env['platform'] == 'linux' \ '#/src/gallium/drivers', ]) - st_xlib = env.ConvenienceLibrary( - target = 'ws_xlib', - source = [ - 'xlib_cell.c', - 'xlib_llvmpipe.c', - 'xlib_softpipe.c', - 'xlib_sw_winsys.c', - ] + ws_xlib = env.ConvenienceLibrary( + target = 'ws_xlib', + source = [ + 'xlib_cell.c', + 'xlib_llvmpipe.c', + 'xlib_softpipe.c', + 'xlib_sw_winsys.c', + ] ) Export('ws_xlib') -- cgit v1.2.3 From e8d884eab9b96f2db647363f17649ff35570c710 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Wed, 10 Mar 2010 11:34:09 +0000 Subject: scons: Fixup the libgl-gdi build. --- SConstruct | 2 -- src/gallium/targets/SConscript | 10 +++++----- src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c | 3 ++- src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c | 3 ++- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gallium/targets/SConscript') diff --git a/SConstruct b/SConstruct index 606be015c0..6ed44ddd06 100644 --- a/SConstruct +++ b/SConstruct @@ -53,8 +53,6 @@ opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers, ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe'])) opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys, ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon'])) -opts.Add(ListVariable('targets', 'target drivers to build', 'all', - ['xlib'])) opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript index 266d705f89..df62fc65fb 100644 --- a/src/gallium/targets/SConscript +++ b/src/gallium/targets/SConscript @@ -5,12 +5,12 @@ Import('*') # 'drm/SConscript', # ]) -if 'xlib' in env['targets']: +if 'xlib' in env['winsys']: SConscript([ 'libgl-xlib/SConscript', ]) -#if 'gdi' in env['winsys']: -# SConscript([ -# 'gdi/SConscript', -# ]) +if 'gdi' in env['winsys']: + SConscript([ + 'libgl-gdi/SConscript', + ]) diff --git a/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c b/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c index f20c2614e2..29316a1ce2 100644 --- a/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c +++ b/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c @@ -37,9 +37,10 @@ #include #include "stw_winsys.h" -#include "gdi_sw_winsys.h" +#include "gdi/gdi_sw_winsys.h" #include "llvmpipe/lp_texture.h" #include "llvmpipe/lp_screen.h" +#include "llvmpipe/lp_public.h" static struct pipe_screen * diff --git a/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c b/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c index 5c5c154c7f..dfe60195d9 100644 --- a/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c +++ b/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c @@ -37,9 +37,10 @@ #include #include "stw_winsys.h" -#include "gdi_sw_winsys.h" +#include "gdi/gdi_sw_winsys.h" #include "softpipe/sp_texture.h" #include "softpipe/sp_screen.h" +#include "softpipe/sp_public.h" static struct pipe_screen * -- cgit v1.2.3