Merge pull request #2711 from lrusak/graphics-default

config/graphic: reset variables when calling get_graphicsdrivers()
This commit is contained in:
MilhouseVH 2018-05-21 17:28:51 +01:00 committed by GitHub
commit 1626fdb8df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11,82 +11,96 @@ else
fi fi
get_graphicdrivers() { get_graphicdrivers() {
# set defaults
GALLIUM_DRIVERS=""
DRI_DRIVERS=""
XORG_DRIVERS=""
LLVM_SUPPORT="no"
COMPOSITE_SUPPORT="no"
VDPAU_SUPPORT="no"
VAAPI_SUPPORT="no"
if [ "$GRAPHIC_DRIVERS" = "all" ]; then if [ "$GRAPHIC_DRIVERS" = "all" ]; then
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4" GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4"
fi fi
for drv in $GRAPHIC_DRIVERS; do if listcontains "$GRAPHIC_DRIVERS" "i915"; then
if [ "$drv" = "i915" ]; then DRI_DRIVERS="$DRI_DRIVERS,i915"
DRI_DRIVERS="$DRI_DRIVERS,i915" XORG_DRIVERS="$XORG_DRIVERS intel"
XORG_DRIVERS="$XORG_DRIVERS intel" COMPOSITE_SUPPORT="yes"
COMPOSITE_SUPPORT="yes" VAAPI_SUPPORT="yes"
VAAPI_SUPPORT="yes" fi
fi
if [ "$drv" = "i965" ]; then if listcontains "$GRAPHIC_DRIVERS" "i965"; then
DRI_DRIVERS="$DRI_DRIVERS,i965" DRI_DRIVERS="$DRI_DRIVERS,i965"
XORG_DRIVERS="$XORG_DRIVERS intel" XORG_DRIVERS="$XORG_DRIVERS intel"
COMPOSITE_SUPPORT="yes" COMPOSITE_SUPPORT="yes"
VAAPI_SUPPORT="yes" VAAPI_SUPPORT="yes"
fi fi
if [ "$drv" = "nvidia" ]; then if listcontains "$GRAPHIC_DRIVERS" "nvidia"; then
XORG_DRIVERS="$XORG_DRIVERS nvidia" XORG_DRIVERS="$XORG_DRIVERS nvidia"
VDPAU_SUPPORT="yes" VDPAU_SUPPORT="yes"
fi fi
if [ "$drv" = "nvidia-legacy" ]; then if listcontains "$GRAPHIC_DRIVERS" "nvidia-legacy"; then
XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy" XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
VDPAU_SUPPORT="yes" VDPAU_SUPPORT="yes"
fi fi
if [ "$drv" = "r200" ]; then if listcontains "$GRAPHIC_DRIVERS" "r200"; then
DRI_DRIVERS="$DRI_DRIVERS,r200" DRI_DRIVERS="$DRI_DRIVERS,r200"
XORG_DRIVERS="$XORG_DRIVERS ati" XORG_DRIVERS="$XORG_DRIVERS ati"
COMPOSITE_SUPPORT="yes" COMPOSITE_SUPPORT="yes"
fi fi
if [ "$drv" = "r300" ]; then if listcontains "$GRAPHIC_DRIVERS" "r300"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300" GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
XORG_DRIVERS="$XORG_DRIVERS ati" XORG_DRIVERS="$XORG_DRIVERS ati"
LLVM_SUPPORT="yes" LLVM_SUPPORT="yes"
COMPOSITE_SUPPORT="yes" COMPOSITE_SUPPORT="yes"
VDPAU_SUPPORT="yes" VDPAU_SUPPORT="yes"
fi fi
if [ "$drv" = "r600" ]; then if listcontains "$GRAPHIC_DRIVERS" "r600"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600" GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
XORG_DRIVERS="$XORG_DRIVERS ati" XORG_DRIVERS="$XORG_DRIVERS ati"
LLVM_SUPPORT="yes" LLVM_SUPPORT="yes"
COMPOSITE_SUPPORT="yes" COMPOSITE_SUPPORT="yes"
VDPAU_SUPPORT="yes" VDPAU_SUPPORT="yes"
VAAPI_SUPPORT="yes" VAAPI_SUPPORT="yes"
fi fi
if [ "$drv" = "radeonsi" ]; then if listcontains "$GRAPHIC_DRIVERS" "radeonsi"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,radeonsi" GALLIUM_DRIVERS="$GALLIUM_DRIVERS,radeonsi"
XORG_DRIVERS="$XORG_DRIVERS ati amdgpu" XORG_DRIVERS="$XORG_DRIVERS ati amdgpu"
LLVM_SUPPORT="yes" LLVM_SUPPORT="yes"
COMPOSITE_SUPPORT="yes" COMPOSITE_SUPPORT="yes"
VDPAU_SUPPORT="yes" VDPAU_SUPPORT="yes"
VAAPI_SUPPORT="yes" VAAPI_SUPPORT="yes"
fi fi
if [ "$drv" = "vmware" ]; then if listcontains "$GRAPHIC_DRIVERS" "vmware"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga" GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
XORG_DRIVERS="$XORG_DRIVERS vmware" XORG_DRIVERS="$XORG_DRIVERS vmware"
COMPOSITE_SUPPORT="yes" COMPOSITE_SUPPORT="yes"
fi fi
if [ "$drv" = "virtio" ]; then if listcontains "$GRAPHIC_DRIVERS" "virtio"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,virgl" GALLIUM_DRIVERS="$GALLIUM_DRIVERS,virgl"
fi fi
if [ "$drv" = "vc4" ]; then if listcontains "$GRAPHIC_DRIVERS" "vc4"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,vc4" GALLIUM_DRIVERS="$GALLIUM_DRIVERS,vc4"
VAAPI_SUPPORT="no" VAAPI_SUPPORT="no"
VDPAU_SUPPORT="no" VDPAU_SUPPORT="no"
fi fi
done # remove leading comma if present
[[ $GALLIUM_DRIVERS =~ ^, ]] && GALLIUM_DRIVERS="${GALLIUM_DRIVERS:1}"
[[ $DRI_DRIVERS =~ ^, ]] && DRI_DRIVERS="${DRI_DRIVERS:1}"
# remove duplicate entries
XORG_DRIVERS="$(echo $XORG_DRIVERS | xargs -n1 | sort -u | xargs)"
} }