Re: [Mesa-dev] [PATCH v2 24/25] intel/vulkan: Get rid of recursive make

[Grazvydas Ignotas]

On Thu, Mar 9, 2017 at 9:07 PM, Emil Velikov  wrote:
> From: Jason Ekstrand 
>
> v2 [Emil Velikov]
>  - Various fixes and initial stab at the Android build.
>  - Keep the generation rules/EXTRA_DIST outside the conditional

This has broken anv build for me, because I don't have vulkan.h
anywhere in my system except mesa:
make[4]: Entering directory '/home/notaz/src/radeon/mesa/src/intel'
  CC   vulkan/vulkan_libvulkan_intel_la-anv_gem.lo
In file included from vulkan/anv_private.h:66:0,
 from vulkan/anv_gem.c:31:
/opt/xorg/include/vulkan/vulkan_intel.h:27:20: fatal error: vulkan.h:
No such file or directory
compilation terminated.

I hope that wasn't intentional?

Gražvydas
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH v2 24/25] intel/vulkan: Get rid of recursive make

[Emil Velikov]

From: Jason Ekstrand 

v2 [Emil Velikov]
 - Various fixes and initial stab at the Android build.
 - Keep the generation rules/EXTRA_DIST outside the conditional
---
 configure.ac   |   1 -
 src/Makefile.am|   5 -
 src/intel/Android.mk   |   2 +-
 src/intel/{vulkan/Android.mk => Android.vulkan.mk} |  24 +--
 src/intel/Makefile.am  |   6 +
 src/intel/Makefile.sources |  65 ++
 src/intel/Makefile.vulkan.am   | 220 +
 src/intel/vulkan/Makefile.am   | 204 ---
 src/intel/vulkan/Makefile.sources  |  85 
 9 files changed, 305 insertions(+), 307 deletions(-)
 rename src/intel/{vulkan/Android.mk => Android.vulkan.mk} (89%)
 create mode 100644 src/intel/Makefile.vulkan.am
 delete mode 100644 src/intel/vulkan/Makefile.am
 delete mode 100644 src/intel/vulkan/Makefile.sources

diff --git a/configure.ac b/configure.ac
index 5ab906898a..628aec3ceb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2687,7 +2687,6 @@ AC_CONFIG_FILES([Makefile
src/glx/windows/windowsdriproto.pc
src/gtest/Makefile
src/intel/Makefile
-   src/intel/vulkan/Makefile
src/loader/Makefile
src/mapi/Makefile
src/mapi/es1api/glesv1_cm.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 01e9edfc48..aa5f8aaf7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -117,11 +117,6 @@ if HAVE_EGL
 SUBDIRS += egl
 endif
 
-## Requires the i965 compiler (part of mesa) and wayland-drm
-if HAVE_INTEL_VULKAN
-SUBDIRS += intel/vulkan
-endif
-
 # Requires wayland-drm
 if HAVE_RADEON_VULKAN
 SUBDIRS += amd/vulkan
diff --git a/src/intel/Android.mk b/src/intel/Android.mk
index be2ba2fd9e..db6c770f35 100644
--- a/src/intel/Android.mk
+++ b/src/intel/Android.mk
@@ -30,4 +30,4 @@ include $(LOCAL_PATH)/Android.common.mk
 include $(LOCAL_PATH)/Android.compiler.mk
 include $(LOCAL_PATH)/Android.genxml.mk
 include $(LOCAL_PATH)/Android.isl.mk
-include $(LOCAL_PATH)/vulkan/Android.mk
+include $(LOCAL_PATH)/Android.vulkan.mk
diff --git a/src/intel/vulkan/Android.mk b/src/intel/Android.vulkan.mk
similarity index 89%
rename from src/intel/vulkan/Android.mk
rename to src/intel/Android.vulkan.mk
index 69e4d0c648..65357afef2 100644
--- a/src/intel/vulkan/Android.mk
+++ b/src/intel/Android.vulkan.mk
@@ -23,7 +23,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Makefile.sources
 
-VK_ENTRYPOINTS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/anv_entrypoints_gen.py
+VK_ENTRYPOINTS_SCRIPT := $(MESA_PYTHON2) 
$(LOCAL_PATH)/vulkan/anv_entrypoints_gen.py
 
 VULKAN_COMMON_INCLUDES := \
$(MESA_TOP)/include/vulkan \
@@ -51,15 +51,16 @@ intermediates := $(call local-generated-sources-dir)
 LOCAL_C_INCLUDES := \
$(VULKAN_COMMON_INCLUDES)
 
-LOCAL_GENERATED_SOURCES += $(intermediates)/anv_entrypoints.h
-LOCAL_GENERATED_SOURCES += $(intermediates)/dummy.c
+LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_entrypoints.h
+LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/dummy.c
 
-$(intermediates)/dummy.c:
+$(intermediates)/vulkan/dummy.c:
@mkdir -p $(dir $@)
@echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))"
$(hide) touch $@
 
-$(intermediates)/anv_entrypoints.h:
+$(intermediates)/vulkan/anv_entrypoints.h:
+   @mkdir -p $(dir $@)
$(hide) cat $(MESA_TOP)/src/vulkan/registry/vk.xml | 
$(VK_ENTRYPOINTS_SCRIPT) header > $@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
@@ -84,7 +85,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen7
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(GEN7_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GEN7_FILES)
 LOCAL_CFLAGS := -DGEN_VERSIONx10=70
 
 LOCAL_C_INCLUDES := $(ANV_INCLUDES)
@@ -104,7 +105,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen75
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(GEN75_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GEN75_FILES)
 LOCAL_CFLAGS := -DGEN_VERSIONx10=75
 
 LOCAL_C_INCLUDES := $(ANV_INCLUDES)
@@ -124,7 +125,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen8
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(GEN8_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GEN8_FILES)
 LOCAL_CFLAGS := -DGEN_VERSIONx10=80
 
 LOCAL_C_INCLUDES := $(ANV_INCLUDES)
@@ -144,7 +145,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_anv_gen9
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_SRC_FILES := $(GEN9_FILES)
+LOCAL_SRC_FILES := $(VULKAN_GEN9_FILES)
 LOCAL_CFLAGS := -DGEN_VERSIONx10=90
 
 LOCAL_C_INCLUDES := $(ANV_INCLUDES)
@@ -177,9 +178,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_genxml \
libmesa_vulkan_util
 
-LOCAL_GENERATED_SOURCES += $(intermediates)/anv_entrypoints.c
+LOCAL_GENERATED_SOURCES +=