nouveau: don't assume libdrm include prefix

drm headers may be installed in a different directory

Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>

diff --git a/src/gallium/drivers/nouveau/nouveau_context.h b/src/gallium/drivers/nouveau/nouveau_context.h
index bad5ab7319ba8db8058091e7a52f177166f807dd..c8d9d841d6e99635707658245d4bdc6b125017f5 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_context.h
+++ b/src/gallium/drivers/nouveau/nouveau_context.h
@@ -2,7 +2,7 @@
 #define __NOUVEAU_CONTEXT_H__
 
 #include "pipe/p_context.h"
-#include <libdrm/nouveau.h>
+#include <nouveau.h>
 
 #define NOUVEAU_MAX_SCRATCH_BUFS 4
 

diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index 19892b17c6cd5b2814a3413cc0a2d86654af5cd0..9d71bf77dd4d029d551fe14f812cb7d4d4fd6142 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -14,7 +14,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <libdrm/nouveau_drm.h>
+#include <nouveau_drm.h>
 
 #include "nouveau_winsys.h"
 #include "nouveau_screen.h"

diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.h b/src/gallium/drivers/nouveau/nouveau_vp3_video.h
index 0193ed02ddb2956353f08968017f6ca0b91b35c5..88c14ec60ff67756304273778536d4e89af4af19 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_vp3_video.h
+++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.h
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <libdrm/nouveau.h>
+#include <nouveau.h>
 
 #include "pipe/p_defines.h"
 #include "vl/vl_video_buffer.h"

diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index 9993ed6ee720b5c8037980f62ad6278960d7ff27..51effb1d8d222e09da5f8be1560b450a3c9353d1 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -6,7 +6,7 @@
 
 #include "pipe/p_defines.h"
 
-#include <libdrm/nouveau.h>
+#include <nouveau.h>
 
 #ifndef NV04_PFIFO_MAX_PACKET_LEN
 #define NV04_PFIFO_MAX_PACKET_LEN 2047

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
index b6a827634c89bd70d006ffe2ac1da9b176cc9503..8b46e51cbaf3995aa4598070995d1fe8ee7798b1 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
@@ -38,7 +38,7 @@
 #undef NDEBUG
 #include <assert.h>
 
-#include <libdrm/nouveau.h>
+#include <nouveau.h>
 #include "nouveau_screen.h"
 #include "nouveau_state.h"
 #include "nouveau_surface.h"