radeonsi: Make sure libdrm_radeon headers are picked up from the right place

And remove libdrm/ from a winsys include statement.

Signed-off-by: Jonathan Gray <jsg@jsg.id.au>

diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index 46aa998d51283a7cff18cc7d07ca971d762586a6..0c27973df3bf62c40374594dd22ff88a1e3fa07f 100644 (file)
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -29,7 +29,8 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/drivers/radeon \
        -I$(top_srcdir)/src/gallium/drivers \
        -I$(top_srcdir)/include \
-       $(GALLIUM_CFLAGS)
+       $(GALLIUM_CFLAGS) \
+       $(RADEON_CFLAGS)
 AM_CFLAGS = $(LLVM_CFLAGS)
 
 libradeonsi_la_SOURCES = $(C_SOURCES)

diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h
index 9c6589a7a96c4f0bcca68ce116998e3a5fa80d22..1367982850cb9ba22cc1a2716d1a4cb29a2fd10a 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_winsys.h
+++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h
@@ -41,7 +41,7 @@
  */
 
 #include "pipebuffer/pb_buffer.h"
-#include "libdrm/radeon_surface.h"
+#include "radeon_surface.h"
 
 #define RADEON_MAX_CMDBUF_DWORDS (16 * 1024)