[Mesa-dev] [PATCH] configure.ac: When built with galluim check for the respective LIBDRM_*

[Alex Deucher]

On Thu, Jul 14, 2011 at 4:54 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> On Thu, 14 Jul 2011 21:40:13 +0100, Marek Olšák <maraeo at gmail.com> wrote:
>
>> r300g and r600g do not use libdrm_radeon. Only the classic drivers do.
>>
>> Marek
>
> There appears to be a dependency on "radeon_drm.h" in the winsys files
>
> ./src/gallium/drivers/r600/r600_buffer.c:#include "radeon_drm.h"
> ./src/gallium/winsys/r600/drm/r600_drm.c:#include "radeon_drm.h"
> ./src/gallium/winsys/r600/drm/r600_bo.c:#include "radeon_drm.h"
> ./src/gallium/winsys/r600/drm/r600_hw_context.c:#include "radeon_drm.h"
> ./src/gallium/winsys/r600/drm/radeon_bo.c:#include "radeon_drm.h"
> ./src/gallium/winsys/r600/drm/evergreen_hw_context.c:#include "radeon_drm.h"
> ./src/gallium/winsys/radeon/drm/radeon_drm_cs.h:#include <radeon_drm.h>
>
> A quick 'find / -name "radeon_drm.h"' seems to find only
> /usr/include/libdrm/radeon_drm.h (provided by libdrm_radeon)
>
> Can you please confirm/dismiss if it is distro specific

It comes from the kernel.

Alex

>
> Thanks
> Emil
>
>>
>> On Thu, Jul 14, 2011 at 10:35 PM, Emil Velikov <emil.l.velikov at gmail.com>
>> wrote:
>>>
>>> In a rare case of building gallium only, we need to
>>> check if the required packages are available
>>>
>>> libdrm_[intel|radeon|nouveau] - gallium[i915 i965|r300 r600|nouveau]
>>>
>>> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
>>> ---
>>>  configure.ac |    5 +++++
>>>  1 files changed, 5 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/configure.ac b/configure.ac
>>> index c186240..f963b88 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -1908,6 +1908,7 @@ if test "x$with_gallium_drivers" != x; then
>>>            gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx"
>>> "xa-vmwgfx"
>>>            ;;
>>>        xi915)
>>> +            PKG_CHECK_MODULES([INTEL], [libdrm_intel >=
>>> $LIBDRM_INTEL_REQUIRED])
>>>            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 softpipe"
>>>            if test "x$MESA_LLVM" = x1; then
>>>                GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
>>> @@ -1916,6 +1917,7 @@ if test "x$with_gallium_drivers" != x; then
>>>            gallium_check_st "i915/drm" "dri-i915" "xorg-i915"
>>>            ;;
>>>        xi965)
>>> +            PKG_CHECK_MODULES([INTEL], [libdrm_intel >=
>>> $LIBDRM_INTEL_REQUIRED])
>>>            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965 softpipe"
>>>            if test "x$MESA_LLVM" = x1; then
>>>                GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
>>> @@ -1923,15 +1925,18 @@ if test "x$with_gallium_drivers" != x; then
>>>            gallium_check_st "i965/drm" "dri-i965" "xorg-i965"
>>>            ;;
>>>        xr300)
>>> +            PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon >=
>>> $LIBDRM_RADEON_REQUIRED])
>>>            gallium_require_llvm "Gallium R300"
>>>            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
>>>            gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" ""
>>> "xvmc-r300" "vdpau-r300" "va-r300"
>>>            ;;
>>>        xr600)
>>> +            PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon >=
>>> $LIBDRM_RADEON_REQUIRED])
>>>            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
>>>            gallium_check_st "r600/drm" "dri-r600" "" "" "xvmc-r600"
>>> "vdpau-r600" "va-r600"
>>>            ;;
>>>        xnouveau)
>>> +            PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >=
>>> $LIBDRM_NOUVEAU_REQUIRED])
>>>            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50
>>> nvc0"
>>>            gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" ""
>>> "xvmc-nouveau"
>>>            ;;
>>> --
>>> 1.7.6
>>>
>>> _______________________________________________
>>> mesa-dev mailing list
>>> mesa-dev at lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>>>
>
>
> --
> Using Opera's revolutionary email client: http://www.opera.com/mail/
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>