On Mon, Mar 20, 2017 at 8:18 AM, Emil Velikov <[email protected]> wrote:
> From: Emil Velikov <[email protected]> > > At the moment, we would honour any system headers - vulkan_intel.h in > particular over the ones in-tree. > > Thus, if one does inclemental build of mesa, without the vulkan.h > already installed (or at least not in the same directory as > vulkan_intel.h) the build will fail. > > In the future we might want to upstream the vulkan_intel.h within > vulkan.h, but in either case the more robust thing is to rely on our own > copy. > Actually, vulkan_intel.h will get replaced by chad's new dma-buf extensions. > Cc: Grazvydas Ignotas <[email protected]> > Fixes: ee8044fd "intel/vulkan: Get rid of recursive make" > Suggested-by: Jason Ekstrand <[email protected]> > Reported-by: Grazvydas Ignotas <[email protected]> > Signed-off-by: Emil Velikov <[email protected]> > --- > Grazvydas, since I butchered if while trying to explain myself I went > ahead and addressed the problem. Please double-check on your end. > > Thanks > --- > src/intel/Makefile.vulkan.am | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am > index 185780246e2..7aacdf4e094 100644 > --- a/src/intel/Makefile.vulkan.am > +++ b/src/intel/Makefile.vulkan.am > @@ -85,6 +85,7 @@ VULKAN_CFLAGS = \ > -msse2 > > VULKAN_CPPFLAGS = \ > + $(AM_CPPFLAGS) \ > -I$(top_srcdir)/src/compiler \ > -I$(top_srcdir)/src/intel/compiler \ > -I$(top_builddir)/src/intel/vulkan \ > @@ -92,8 +93,7 @@ VULKAN_CPPFLAGS = \ > -I$(top_srcdir)/src/vulkan/wsi \ > -I$(top_builddir)/src/vulkan/util \ > -I$(top_srcdir)/src/vulkan/util \ > - $(LIBDRM_CFLAGS) \ > - $(AM_CPPFLAGS) > + $(LIBDRM_CFLAGS) > Why can't we just flip AM_CPPFLAGS and LIBDRM_CPPFLAGS? > > vulkan_libanv_gen7_la_CFLAGS = $(VULKAN_CFLAGS) > vulkan_libanv_gen7_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=70 > -- > 2.11.1 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
