On Don, 2013-07-18 at 14:45 +1000, Jonathan Gray wrote: > Signed-off-by: Jonathan Gray <j...@jsg.id.au> > --- > src/gallium/drivers/radeonsi/Makefile.am | 3 ++- > src/gallium/winsys/radeon/drm/radeon_winsys.h | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git src/gallium/drivers/radeonsi/Makefile.am > src/gallium/drivers/radeonsi/Makefile.am > index 46aa998..1cd85c4 100644 > --- src/gallium/drivers/radeonsi/Makefile.am > +++ 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) \ > + $(LIBDRM_CFLAGS) > AM_CFLAGS = $(LLVM_CFLAGS) > > libradeonsi_la_SOURCES = $(C_SOURCES) > diff --git src/gallium/winsys/radeon/drm/radeon_winsys.h > src/gallium/winsys/radeon/drm/radeon_winsys.h > index a619d70..a500193 100644 > --- src/gallium/winsys/radeon/drm/radeon_winsys.h > +++ 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) >
I guess this is okay for now, though in the long run we shouldn't leak winsys/platform specific details into the Gallium pipe driver like this. Don't you need to add $(LIBDRM_CFLAGS) to src/gallium/drivers/r600/Makefile.am as well though? -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Debian, X and DRI developer _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
