From 43218a45a4cdbe2bc92867dc143f4b0e5fe9ca8d Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Wed, 24 Mar 2010 11:45:30 +0100 Subject: gallium: Move xorg drivers to targets Attached output from git commit: rename src/gallium/{winsys/drm/intel/xorg => targets/xorg-i915}/Makefile (95%) rename src/gallium/{winsys/drm/intel/xorg => targets/xorg-i915}/intel_xorg.c (98%) rename src/gallium/{winsys/drm/i965/xorg => targets/xorg-i965}/Makefile (78%) rename src/gallium/{winsys/drm/i965/xorg => targets/xorg-i965}/intel_xorg.c (98%) rename src/gallium/{winsys/drm/nouveau/xorg => targets/xorg-nouveau}/Makefile (96%) rename src/gallium/{winsys/drm/nouveau/xorg => targets/xorg-nouveau}/nouveau_xorg.c (98%) rename src/gallium/{winsys/drm/radeon/xorg => targets/xorg-radeon}/Makefile (73%) rename src/gallium/{winsys/drm/radeon/xorg => targets/xorg-radeon}/radeon_xorg.c (98%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/Makefile (97%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/SConscript (100%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_driver.h (100%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_hook.h (100%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_ioctl.c (99%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_screen.c (100%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_video.c (99%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_xorg.c (100%) --- src/gallium/targets/xorg-vmwgfx/SConscript | 57 ++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/gallium/targets/xorg-vmwgfx/SConscript (limited to 'src/gallium/targets/xorg-vmwgfx/SConscript') diff --git a/src/gallium/targets/xorg-vmwgfx/SConscript b/src/gallium/targets/xorg-vmwgfx/SConscript new file mode 100644 index 0000000000..1e5d8ff7fe --- /dev/null +++ b/src/gallium/targets/xorg-vmwgfx/SConscript @@ -0,0 +1,57 @@ +import os.path + +Import('*') + +if env['platform'] == 'linux': + + env = env.Clone() + + env.ParseConfig('pkg-config --cflags --libs libdrm xorg-server') + + env.Prepend(CPPPATH = [ + '#/include', + '#/src/gallium', + '#/src/mesa', + '#/src/gallium/drivers/svga', + '#/src/gallium/drivers/svga/include', + ]) + + env.Append(CPPDEFINES = [ + ]) + + if env['gcc']: + env.Append(CPPDEFINES = [ + 'HAVE_STDINT_H', + 'HAVE_SYS_TYPES_H', + ]) + + env.Append(CFLAGS = [ + '-std=gnu99', + '-D_FILE_OFFSET_BITS=64', + ]) + + env.Prepend(LIBPATH = [ + ]) + + env.Prepend(LIBS = [ + trace, + st_xorg, + svgadrm, + svga, + gallium, + ]) + + sources = [ + 'vmw_ioctl.c', + 'vmw_screen.c', + 'vmw_video.c', + 'vmw_xorg.c', + ] + + # TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions + env.LoadableModule( + target ='vmwgfx_drv.so', + source = sources, + LIBS = env['LIBS'], + SHLIBPREFIX = '', + ) -- cgit v1.2.3 From f5ae5b5396ce93d138d6fde5d79e999175dfd63f Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Wed, 24 Mar 2010 19:16:29 +0100 Subject: gallium: Add warnings incase pipe drivers are not built in targets --- src/gallium/targets/dri-i915/SConscript | 4 ++++ src/gallium/targets/dri-i965/SConscript | 4 ++++ src/gallium/targets/dri-radeong/SConscript | 4 ++++ src/gallium/targets/dri-vmwgfx/SConscript | 4 ++++ src/gallium/targets/xorg-vmwgfx/SConscript | 4 ++++ 5 files changed, 20 insertions(+) (limited to 'src/gallium/targets/xorg-vmwgfx/SConscript') diff --git a/src/gallium/targets/dri-i915/SConscript b/src/gallium/targets/dri-i915/SConscript index 0df841d879..8d4ecefbe1 100644 --- a/src/gallium/targets/dri-i915/SConscript +++ b/src/gallium/targets/dri-i915/SConscript @@ -1,5 +1,9 @@ Import('*') +if not 'i915' in env['drivers']: + print 'warning: i915 pipe driver not built skipping i915_dri.so' + Return() + env = drienv.Clone() env.ParseConfig('pkg-config --cflags --libs libdrm_intel') diff --git a/src/gallium/targets/dri-i965/SConscript b/src/gallium/targets/dri-i965/SConscript index a99533fd24..3b37d8e1af 100644 --- a/src/gallium/targets/dri-i965/SConscript +++ b/src/gallium/targets/dri-i965/SConscript @@ -1,5 +1,9 @@ Import('*') +if not 'i965' in env['drivers']: + print 'warning: i965 pipe driver not built skipping i965_dri.so' + Return() + env = drienv.Clone() env.ParseConfig('pkg-config --cflags --libs libdrm_intel') diff --git a/src/gallium/targets/dri-radeong/SConscript b/src/gallium/targets/dri-radeong/SConscript index c4989d1b59..bb3b5b9304 100644 --- a/src/gallium/targets/dri-radeong/SConscript +++ b/src/gallium/targets/dri-radeong/SConscript @@ -1,5 +1,9 @@ Import('*') +if not 'r300' in env['drivers']: + print 'warning: r300 pipe driver not built skipping radeong_dri.so' + Return() + env = drienv.Clone() env.ParseConfig('pkg-config --cflags --libs libdrm_radeon') diff --git a/src/gallium/targets/dri-vmwgfx/SConscript b/src/gallium/targets/dri-vmwgfx/SConscript index 4437916c29..7d248e8a9c 100644 --- a/src/gallium/targets/dri-vmwgfx/SConscript +++ b/src/gallium/targets/dri-vmwgfx/SConscript @@ -1,5 +1,9 @@ Import('*') +if not 'svga' in env['drivers']: + print 'warning: svga pipe driver not built skipping vmwgfx_dri.so' + Return() + env = drienv.Clone() drivers = [ diff --git a/src/gallium/targets/xorg-vmwgfx/SConscript b/src/gallium/targets/xorg-vmwgfx/SConscript index 1e5d8ff7fe..b63ab99e05 100644 --- a/src/gallium/targets/xorg-vmwgfx/SConscript +++ b/src/gallium/targets/xorg-vmwgfx/SConscript @@ -2,6 +2,10 @@ import os.path Import('*') +if not 'svga' in env['drivers']: + print 'warning: svga pipe driver not built skipping vmwgfx_drv.so' + Return() + if env['platform'] == 'linux': env = env.Clone() -- cgit v1.2.3