On Thu, Mar 2, 2017 at 4:15 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote:
> On 2 March 2017 at 05:28, Jason Ekstrand <ja...@jlekstrand.net> wrote: > > Previously, we were depending on EGL for generating the headers and > > providing the protocol symbols. However, since neither Vulkan driver > > actually wants to link against EGL, this is kind-of pointless. It also > > creates a weird build dependency. > > Yeah, the Vulkan dependency on egl/wayland is quite weird. This > alongside my "rename --with-egl-platforms -> --with-platforms" will > get us close to nirvana. > The final piece being wl_drm_interface always being exported... for > which I'll try to polish the wayland patches and send them upstream > ;-) > > A couple of small nitpicks below: > > > --- > > src/amd/vulkan/Makefile.am | 3 --- > > src/intel/vulkan/Makefile.am | 7 ------- > > src/vulkan/.gitignore | 2 ++ > > src/vulkan/Makefile.am | 19 +++++++++++++++---- > > src/vulkan/Makefile.sources | 4 ++++ > > src/vulkan/wsi/wsi_common_wayland.c | 2 +- > > 6 files changed, 22 insertions(+), 15 deletions(-) > > create mode 100644 src/vulkan/.gitignore > > > > > --- /dev/null > > +++ b/src/vulkan/.gitignore > > @@ -0,0 +1,2 @@ > > +wayland-drm-client-protocol.h > > +wayland-drm-protocol.c > Missing wsi/ prefix ? > > > diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am > > index f7aca8e..81cd23d 100644 > > --- a/src/vulkan/Makefile.am > > +++ b/src/vulkan/Makefile.am > > @@ -49,17 +49,28 @@ VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) -lX11-xcb > > endif > > > > if HAVE_PLATFORM_WAYLAND > > +BUILT_SOURCES += $(VULKAN_WSI_WAYLAND_GENERATED_FILES) > Move this outside of the conditional, otherwise we'll be missing files > in some 'fun' cases. > Really? Care to elaborate? Won't that cause it to complain that it can't generate those files when Wayland is disabled? > Which reminds me to send a related fix to configure.ac > > > + > > +WL_DRM_XML = $(top_srcdir)/src/egl/wayland/wayland-drm/wayland-drm.xml > > + > > MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) > Already exists > > +wsi/wayland-drm-protocol.c : $(WL_DRM_XML) > $(MKDIR_GEN) > > > + $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ > > + > > +wsi/wayland-drm-client-protocol.h : $(WL_DRM_XML) > $(MKDIR_GEN) > I'll add those two. > > + $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ > > + > ... or older autotools versions will fail. > > With the above > Reviewed-by: Emil Velikov <emil.veli...@collabora.com> > > Thanks > Emil >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
