Mesa (master): target-helpers: Do not build kms_dri on libdrm-less platforms.
Emil Velikov
evelikov at kemper.freedesktop.org
Fri Aug 1 00:37:08 UTC 2014
Module: Mesa
Branch: master
Commit: 095c37e47230125d7fdc4a6b148b8e5cdc2f7262
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=095c37e47230125d7fdc4a6b148b8e5cdc2f7262
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Thu Jul 31 16:30:37 2014 +0100
target-helpers: Do not build kms_dri on libdrm-less platforms.
Fix build since 3b176c441b7ddc5f7d2f891da3f76cf3c1814ce1 for
dri_platform=none hosts.
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/gallium/auxiliary/target-helpers/inline_drm_helper.h | 2 ++
src/gallium/targets/dri/Makefile.am | 1 +
2 files changed, 3 insertions(+)
diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
index 751ceb1..5d02da7 100644
--- a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
@@ -60,6 +60,7 @@ static char* driver_name = NULL;
#if defined(GALLIUM_SOFTPIPE)
#if defined(DRI_TARGET)
+#if defined(HAVE_LIBDRM)
const __DRIextension **__driDriverGetExtensions_kms_swrast(void);
@@ -84,6 +85,7 @@ kms_swrast_create_screen(int fd)
}
#endif
#endif
+#endif
#if defined(GALLIUM_I915)
#if defined(DRI_TARGET)
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index c7fe410..6ab15d8 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -8,6 +8,7 @@ AM_CFLAGS = \
$(GALLIUM_TARGET_CFLAGS)
AM_CPPFLAGS = \
+ $(DEFINES) \
-DDRI_TARGET \
-DGALLIUM_GALAHAD \
-DGALLIUM_NOOP \
More information about the mesa-commit
mailing list