On 10 feb 2009, at 16.46, Brian Paul wrote:
Jakob Bornecrantz wrote:On 10 feb 2009, at 08.17, Michel Dänzer wrote:On Tue, 2009-02-10 at 01:57 +0100, Anders Juel Jensen wrote:On Monday 09 February 2009 22:15:44 Keith Whitwell wrote:but is it possible to build both gallium drivers and classic drivers from the same tree at the same time?or is distro life going to be made shit yet again.Anything's possible -- I guess I'm not clear on which is preferable, so feedback is welcome. We can do either: - have some new build targets, like "linux-gallium-dri" etc, that build the drivers and put them in mesa/lib/xyz_dri.so or - build both lots of drivers, and put the gallium ones in a new directory, like mesa/lib/gallium/xyz_dri.so Note that there are going to be multiple, different copies of xyz_dri.so in the second approach. Is there a third option? KeithIt would be nice if it was possible to have both installed, and an easy way to switch between them in xorg.confIt's always been easier than that: Just point $LIBGL_DRIVERS_PATH to the directory (directories) containing the driver you want to use. Each application can use a different driver (of course, the 3D driver has to be compatible with the X driver).It should definitely possible to build both at the same time especially now that the gallium intel dri drivers use the same drm as the legacy intel dri drivers. I think that even the nouveau use the same drm. Brian I have a patch on gallium-xorg-driver that lets us more fine tune the building of the gallium dri drivers. Is it okay if I revert: "mesa: added new linux-gallium and linux-gallium-debug configs" [1] from gallium-master-merge and apply: "gallium: Introduce new subdirs build variables" [2] from the gallium-xorg-driver branch?I'm not sure I'll fully understand how your solution works until I tryit. How would I build the conventional DRI/Xlib drivers vs. the galliumdrivers?
With the attached patch set there is no difference. You simply build one of the linux-dri-* builds and it builds both legacy and gallium drivers.
The variable you want to play around with is GALLIUM_WINSYS_DIRS and GALLIUM_WINSYS_DRM_DIRS, which is currently set to those drivers which build against drm.git master. Currently nouveau and intel (but there is currently no DRI there but the EGL one builds).
The gallium based drivers ends up in lib/gallium while the legacy ones still goes in the old directory. Maybe that should be changed to lib/ dri as Keith suggested. There are currently no conflicts between the two sets of drivers since the i915 dri driver isn't built. But in the future things are bound to crop up.
Brian, looking at the linux-gallium commit you seem to have included stuff that should have gone into the following commit that introduces libmesagallium. When I work on multiple stuff at the same time and want to separate commits up I use the interactive git add (git add - i). And confirm each change as they go in. Also newer version of gitk show the changes that are about to be committed. Git add interactive can show that with 6.Yeah, I should have split things up better but I was in a rush to get things working.
Do the patches look good? Is it okay if I push? Cheers Jakob.
0001-Revert-mesa-added-new-linux-gallium-and-linux-gall.patch
Description: Binary data
0002-Revert-cell-update-linux-cell-config.patch
Description: Binary data
0003-gallium-Introduce-new-subdirs-build-variables.patch
Description: Binary data
0004-gallium-Install-DRI-drivers-into-lib-gallium.patch
Description: Binary data
0005-gallium-Don-t-rebuild-common-drm-code.patch
Description: Binary data
------------------------------------------------------------------------------ Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
