Strictly speaking xmlpool does not require drm, although it's main (and upto recently only user HW drivers) did. With the dri patch(es) swrast now require xmlpool, thus changing that to dri seems like the only sane option. In other words without this patch and with HW drivers disabled, swrast will fail to build.
Drop the !dri check in SConscript.dri, as it's called only when the variable is set. Signed-off-by: Emil Velikov <[email protected]> --- src/gallium/targets/SConscript.dri | 3 --- src/mesa/drivers/SConscript | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri index c5aab7c..eb1354a 100644 --- a/src/gallium/targets/SConscript.dri +++ b/src/gallium/targets/SConscript.dri @@ -3,9 +3,6 @@ Import('*') -if not env['dri']: - Return() - drienv = env.Clone() drienv.Replace(CPPPATH = [ diff --git a/src/mesa/drivers/SConscript b/src/mesa/drivers/SConscript index 6dcc506..355e680 100644 --- a/src/mesa/drivers/SConscript +++ b/src/mesa/drivers/SConscript @@ -5,7 +5,7 @@ SConscript('osmesa/SConscript') if env['x11']: SConscript('x11/SConscript') -if env['drm']: +if env['dri']: SConscript('dri/common/xmlpool/SConscript') if env['platform'] == 'windows': -- 1.8.4 _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
