summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsapountzis@gmail.com>2010-03-25 17:01:53 +0200
committerGeorge Sapountzis <gsapountzis@gmail.com>2010-03-25 17:01:53 +0200
commit1bed0eb98e00ed9ea7431f19ab3bed8860864264 (patch)
treed6eea89cb518ced5b0652c63034b9d95d9a063a0
parent4ce16e13ce5ca89943b86a8e8cdb5354892a13a6 (diff)
st/dri: add dri_wrapper.h
-rw-r--r--src/gallium/state_trackers/dri/dri1.h2
-rw-r--r--src/gallium/state_trackers/dri/dri2.h2
-rw-r--r--src/gallium/state_trackers/dri/dri_context.c1
-rw-r--r--src/gallium/state_trackers/dri/dri_context.h3
-rw-r--r--src/gallium/state_trackers/dri/dri_screen.h2
-rw-r--r--src/gallium/state_trackers/dri/dri_wrapper.h10
6 files changed, 14 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/dri/dri1.h b/src/gallium/state_trackers/dri/dri1.h
index cced505ea9..f7441f98ab 100644
--- a/src/gallium/state_trackers/dri/dri1.h
+++ b/src/gallium/state_trackers/dri/dri1.h
@@ -36,7 +36,7 @@
#include "dri_drawable.h"
#include "state_tracker/st_api.h"
-#include "dri_util.h"
+#include "dri_wrapper.h"
extern struct dri1_api *__dri1_api_hooks;
diff --git a/src/gallium/state_trackers/dri/dri2.h b/src/gallium/state_trackers/dri/dri2.h
index 06abccc405..e1afcf8ca8 100644
--- a/src/gallium/state_trackers/dri/dri2.h
+++ b/src/gallium/state_trackers/dri/dri2.h
@@ -29,7 +29,7 @@
#define DRI2_H
#include "dri_drawable.h"
-#include "dri_util.h"
+#include "dri_wrapper.h"
const __DRIconfig **
dri_init_screen2(__DRIscreen * sPriv);
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c
index 54568a8b22..34d9a932ea 100644
--- a/src/gallium/state_trackers/dri/dri_context.c
+++ b/src/gallium/state_trackers/dri/dri_context.c
@@ -33,7 +33,6 @@
#include "dri_drawable.h"
#include "dri_context.h"
#include "dri_st_api.h"
-#include "dri1.h"
#include "pipe/p_context.h"
#include "util/u_memory.h"
diff --git a/src/gallium/state_trackers/dri/dri_context.h b/src/gallium/state_trackers/dri/dri_context.h
index 845b420cf8..24d3d0368a 100644
--- a/src/gallium/state_trackers/dri/dri_context.h
+++ b/src/gallium/state_trackers/dri/dri_context.h
@@ -33,8 +33,7 @@
#define DRI_CONTEXT_H
#include "pipe/p_compiler.h"
-#include "drm.h"
-#include "dri_util.h"
+#include "dri_wrapper.h"
struct pipe_context;
struct pipe_fence;
diff --git a/src/gallium/state_trackers/dri/dri_screen.h b/src/gallium/state_trackers/dri/dri_screen.h
index 2b0444603a..639d48661e 100644
--- a/src/gallium/state_trackers/dri/dri_screen.h
+++ b/src/gallium/state_trackers/dri/dri_screen.h
@@ -32,7 +32,7 @@
#ifndef DRI_SCREEN_H
#define DRI_SCREEN_H
-#include "dri_util.h"
+#include "dri_wrapper.h"
#include "xmlconfig.h"
#include "pipe/p_compiler.h"
diff --git a/src/gallium/state_trackers/dri/dri_wrapper.h b/src/gallium/state_trackers/dri/dri_wrapper.h
new file mode 100644
index 0000000000..141ba02706
--- /dev/null
+++ b/src/gallium/state_trackers/dri/dri_wrapper.h
@@ -0,0 +1,10 @@
+#ifndef DRI_WRAPPER_H
+#define DRI_WRAPPER_H
+
+#ifndef __NOT_HAVE_DRM_H
+#include "dri_util.h"
+#else
+#include "drisw_util.h"
+#endif
+
+#endif