From 72c784347bf66b61385cb57bb666033e5234ba69 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 22 Jul 2015 16:34:15 +0100 Subject: 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 --- src/gallium/state_trackers/dri/dri_screen.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/gallium/state_trackers/dri/dri_screen.h') diff --git a/src/gallium/state_trackers/dri/dri_screen.h b/src/gallium/state_trackers/dri/dri_screen.h index 6d46fea9684..4bcb0291d86 100644 --- a/src/gallium/state_trackers/dri/dri_screen.h +++ b/src/gallium/state_trackers/dri/dri_screen.h @@ -122,8 +122,6 @@ struct __DRIimageRec { }; -#ifndef __NOT_HAVE_DRM_H - static inline boolean dri_with_format(__DRIscreen * sPriv) { @@ -134,16 +132,6 @@ dri_with_format(__DRIscreen * sPriv) && (loader->getBuffersWithFormat != NULL); } -#else - -static inline boolean -dri_with_format(__DRIscreen * sPriv) -{ - return TRUE; -} - -#endif - void dri_fill_st_visual(struct st_visual *stvis, struct dri_screen *screen, const struct gl_config *mode); -- cgit v1.2.3