summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2010-03-25 18:28:31 +0100
committerJakob Bornecrantz <[email protected]>2010-03-25 18:28:31 +0100
commit9eaadfeaa54d15fc3eb90d4137795ace4f920b2f (patch)
treee916d197b2168c14f1a9604cb1d486d1299d2b5e
parent8f47f5320f1a8d4750152f7783cf72073d0979bd (diff)
st/dri: Don't include sw vs drm dri headers
-rw-r--r--src/gallium/state_trackers/dri/dri_screen.c3
-rw-r--r--src/gallium/state_trackers/dri/dri_st_api.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c
index 3029d337878..598a07bb646 100644
--- 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 31d2c582aa0..40b24b18e9f 100644
--- 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,