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

2010-03-25 18:28:31 +01:00 · 2010-03-25 18:28:31 +01:00 · 9eaadfeaa5
parent 8f47f5320f
commit 9eaadfeaa5
2 changed files with 6 additions and 0 deletions
--- 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"
--- 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,