summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/dri/Android.mk
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2015-07-22 16:34:15 +0100
committerEmil Velikov <[email protected]>2015-07-22 16:35:25 +0100
commit72c784347bf66b61385cb57bb666033e5234ba69 (patch)
treef9b8e440f01ae56a94ef2c3e48814d1f1a8cebc8 /src/gallium/state_trackers/dri/Android.mk
parent0efd773f719dd2deddb4b6703edf022b294cd349 (diff)
st/dri: unwrap/remove __NOT_HAVE_DRM_H magic
With the dri_interface.h clean of the macro, we can remove the final only st/dri specific use of the very same. Seemingly it was incorrectly used, as the build-time presence of dri2 is not libdrm specific. At run-time, the code is already limited to dri2 use-cases plus returning true, when the extension is not present (or too old) will likely lead to a crash as one tries to use it shortly after the dri_with_format() call. As a side effect this gives us a nice cleanup the builds. Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/dri/Android.mk')
-rw-r--r--src/gallium/state_trackers/dri/Android.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/state_trackers/dri/Android.mk
index 188e4a1404d..4ee43385352 100644
--- a/src/gallium/state_trackers/dri/Android.mk
+++ b/src/gallium/state_trackers/dri/Android.mk
@@ -48,10 +48,7 @@ LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE
LOCAL_SRC_FILES += $(drisw_SOURCES)
endif
-# swrast only?
-ifeq ($(MESA_GPU_DRIVERS),swrast)
-LOCAL_CFLAGS += -D__NOT_HAVE_DRM_H
-else
+ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
LOCAL_SRC_FILES += $(dri2_SOURCES)
LOCAL_SHARED_LIBRARIES := libdrm
endif