st/dri: Don't include sw vs drm dri headers

diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c
index 3029d3378781b499cdc06d702bcdf57f6fb0b936..598a07bb646c6abf759e1e8fb8efc9b919a44200 100644 (file)
--- a/src/gallium/state_trackers/dri/dri_screen.c
+++ b/src/gallium/state_trackers/dri/dri_screen.c
@@ -40,9 +40,12 @@
 #include "dri_drawable.h"
 #include "dri_st_api.h"
 #include "dri1_helper.h"
+#ifndef __NOT_HAVE_DRM_H
 #include "dri1.h"
 #include "dri2.h"
+#else
 #include "drisw.h"
+#endif
 
 #include "util/u_inlines.h"
 #include "pipe/p_screen.h"

diff --git a/src/gallium/state_trackers/dri/dri_st_api.c b/src/gallium/state_trackers/dri/dri_st_api.c
index 31d2c582aa0fdef96de5c9425a0b1d97db238b7d..40b24b18e9f40e8a5715b6a2c1043383f88a32e6 100644 (file)
--- a/src/gallium/state_trackers/dri/dri_st_api.c
+++ b/src/gallium/state_trackers/dri/dri_st_api.c
@@ -36,9 +36,12 @@
 #include "dri_drawable.h"
 #include "dri_st_api.h"
 #include "dri1_helper.h"
+#ifndef __NOT_HAVE_DRM_H
 #include "dri1.h"
 #include "dri2.h"
+#else
 #include "drisw.h"
+#endif
 
 static boolean
 dri_st_framebuffer_validate(struct st_framebuffer_iface *stfbi,