[Mesa-dev] [PATCH 11/18] anv: automake: bring back VULKAN_ENTRYPOINT_CPPFLAGS

[Alejandro Piñeiro]

Probably you are already aware, but just in case. Since this patch got
committed (master commit 220d8c) mesa builds fail when using some build
options:

<skip>

anv_formats.c:427:6: error: no previous prototype for
‘anv_GetPhysicalDeviceFormatProperties’ [-Werror=missing-prototypes]
 void anv_GetPhysicalDeviceFormatProperties(
      ^
anv_formats.c:440:10: error: no previous prototype for
‘anv_GetPhysicalDeviceImageFormatProperties’ [-Werror=missing-prototypes]
 VkResult anv_GetPhysicalDeviceImageFormatProperties(
          ^
anv_formats.c:590:6: error: no previous prototype for
‘anv_GetPhysicalDeviceSparseImageFormatProperties’
[-Werror=missing-prototypes]
 void anv_GetPhysicalDeviceSparseImageFormatProperties(
      ^
cc1: some warnings being treated as errors
Makefile:1305: recipe for target 'anv_formats.lo' failed
make[4]: *** [anv_formats.lo] Error 1
anv_image.c:255:1: error: no previous prototype for ‘anv_CreateImage’
[-Werror=missing-prototypes]
 anv_CreateImage(VkDevice device,

<skip>

Tried to get an alternative patch without too much success.

On 27/05/16 16:35, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> We should not have removed them in the first place. There's a subtle
> difference between generating the complete sources and using them which
> was not obvious as we nuked them.
>
> Without this, the release tarball ends up without various hunks of the
> generated sources, thus things fail at a later stage as we attempt to
> build them.
>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/intel/vulkan/Makefile.am | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
> index 0df2480..3411709 100644
> --- a/src/intel/vulkan/Makefile.am
> +++ b/src/intel/vulkan/Makefile.am
> @@ -124,12 +124,16 @@ VULKAN_LIB_DEPS += \
>  nodist_EXTRA_libvulkan_intel_la_SOURCES = dummy.cpp
>  libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES)
>  
> +VULKAN_ENTRYPOINT_CPPFLAGS = \
> +	-DVK_USE_PLATFORM_XCB_KHR \
> +	-DVK_USE_PLATFORM_WAYLAND_KHR
> +
>  anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
> -	$(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\
> +	$(AM_V_GEN)$(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\
>  	$(PYTHON2) $(srcdir)/anv_entrypoints_gen.py header > $@
>  
>  anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
> -	$(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\
> +	$(AM_V_GEN)$(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\
>  	$(PYTHON2) $(srcdir)/anv_entrypoints_gen.py code > $@
>  
>  BUILT_SOURCES = $(VULKAN_GENERATED_FILES)