st/dri: Fix driver loading if swrast isn't built
authorAaron Watry <awatry@gmail.com>
Sat, 2 Aug 2014 21:10:34 +0000 (16:10 -0500)
committerAaron Watry <awatry@gmail.com>
Sun, 3 Aug 2014 17:13:47 +0000 (12:13 -0500)
commit47e5039680787d1d7072caffdb767a54ecd63218
tree0020ca5924ad0cd97f40bef141109028bfc9d3fd
parent7b3d0a9a1eb11bf70390ad116ed662a47f06183e
st/dri: Fix driver loading if swrast isn't built

If building hardware drivers only, then kms_swrast_create_screen
won't be defined in inline_drm_helper.h and hardware drivers will
fail to dlopen as a result.

Copy the #if guards from inline_drm_helper.h to dri_kms_init_screen
to make the definition/use of the function match.

Fixes radeonsi_dri.so dlopen with the following configure:

./configure --with-dri-drivers= --with-dri-driverdir=/usr/local/lib/dri/ \
--enable-gbm --enable-gallium-gbm --enable-debug --enable-opencl \
--enable-opencl-icd --with-gallium-drivers=radeonsi \
--with-egl-platforms=drm --enable-glx-tls --enable-texture-float \
--enable-omx

Signed-off-by: Aaron Watry <awatry@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
src/gallium/state_trackers/dri/dri2.c