diff options
| author | Emil Velikov <[email protected]> | 2015-10-11 11:53:45 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-11-21 12:52:18 +0000 |
| commit | be430726e2586e1c9932953325b45e0e6a39f301 (patch) | |
| tree | ccc12e39dfffd55d15532ced630e63f022d17d9a | |
| parent | f9c9471b768593d61c486f7a9c0dac52e22fff65 (diff) | |
configure: use HAVE_DRISW_KMS when handling kms swrast
Using HAVE_DRI2 to manage it seems counter-intuitive.
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Rob Clark <[email protected]>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/gallium/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/softpipe/Automake.inc | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 027cfb1de90..98acfdda0a2 100644 --- a/configure.ac +++ b/configure.ac @@ -956,8 +956,13 @@ gnu*|cygwin*) dri_platform='drm' ;; esac +if test "x$enable_dri" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes; then + have_drisw_kms='yes' +fi + AM_CONDITIONAL(HAVE_DRICOMMON, test "x$enable_dri" = xyes ) AM_CONDITIONAL(HAVE_DRISW, test "x$enable_dri" = xyes ) +AM_CONDITIONAL(HAVE_DRISW_KMS, test "x$have_drisw_kms" = xyes ) AM_CONDITIONAL(HAVE_DRI2, test "x$enable_dri" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes ) AM_CONDITIONAL(HAVE_DRI3, test "x$enable_dri3" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes ) AM_CONDITIONAL(HAVE_APPLEDRI, test "x$enable_dri" = xyes -a "x$dri_platform" = xapple ) diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index 611d55fafe2..2c7508385ca 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -98,7 +98,7 @@ if HAVE_DRISW SUBDIRS += winsys/sw/dri endif -if HAVE_DRI2 +if HAVE_DRISW_KMS SUBDIRS += winsys/sw/kms-dri endif diff --git a/src/gallium/drivers/softpipe/Automake.inc b/src/gallium/drivers/softpipe/Automake.inc index 6455f3caa3d..5cedcef9772 100644 --- a/src/gallium/drivers/softpipe/Automake.inc +++ b/src/gallium/drivers/softpipe/Automake.inc @@ -6,7 +6,7 @@ TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la -if HAVE_DRI2 +if HAVE_DRISW_KMS TARGET_DRIVERS += kms_swrast TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la |