st/vdpau: silence an unitialized-variable warning

[mesa.git] / src / intel / Makefile.vulkan.am

diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index 6b71df6319aa923ed7cdc0e8f6057dc9c3b05714..9555d98095bb5600668abc4ed08e3a2685a5a29e 100644 (file)
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -23,37 +23,30 @@
 # rules must be outside of any AM_CONDITIONALs. Otherwise they will be commented
 # out and we'll fail at `make dist'
 vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
-vk_android_native_buffer_xml = $(top_srcdir)/src/vulkan/registry/vk_android_native_buffer.xml
 
 vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py \
                          vulkan/anv_extensions.py \
-                         $(vulkan_api_xml) \
-                         $(vk_android_native_buffer_xml)
+                         $(vulkan_api_xml)
        $(MKDIR_GEN)
        $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py \
                --xml $(vulkan_api_xml) \
-               --xml $(vk_android_native_buffer_xml) \
                --outdir $(builddir)/vulkan
 vulkan/anv_entrypoints.h: vulkan/anv_entrypoints.c
 
 vulkan/anv_extensions.c: vulkan/anv_extensions_gen.py \
                         vulkan/anv_extensions.py \
-                        $(vulkan_api_xml) \
-                        $(vk_android_native_buffer_xml)
+                        $(vulkan_api_xml)
        $(MKDIR_GEN)
        $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions_gen.py \
                --xml $(vulkan_api_xml) \
-               --xml $(vk_android_native_buffer_xml) \
                --out-c $@
 
 vulkan/anv_extensions.h: vulkan/anv_extensions_gen.py \
                         vulkan/anv_extensions.py \
-                        $(vulkan_api_xml) \
-                        $(vk_android_native_buffer_xml)
+                        $(vulkan_api_xml)
        $(MKDIR_GEN)
        $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions_gen.py \
                --xml $(vulkan_api_xml) \
-               --xml $(vk_android_native_buffer_xml) \
                --out-h $@
 
 BUILT_SOURCES += $(VULKAN_GENERATED_FILES)
@@ -71,10 +64,12 @@ EXTRA_DIST += \
        vulkan/TODO
 
 vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py
+       $(MKDIR_GEN)
        $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
                --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
 
 vulkan/intel_icd.@host_cpu@.json : vulkan/anv_extensions.py vulkan/anv_icd.py
+       $(MKDIR_GEN)
        $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
                --lib-path="${libdir}" --out $@
 
@@ -84,6 +79,10 @@ vulkan_includedir = $(includedir)/vulkan
 
 noinst_HEADERS += \
        $(top_srcdir)/include/vulkan/vk_platform.h \
+       $(top_srcdir)/include/vulkan/vulkan_core.h \
+       $(top_srcdir)/include/vulkan/vulkan_wayland.h \
+       $(top_srcdir)/include/vulkan/vulkan_xcb.h \
+       $(top_srcdir)/include/vulkan/vulkan_xlib.h \
        $(top_srcdir)/include/vulkan/vulkan.h
 
 vulkan_include_HEADERS = \
@@ -165,7 +164,10 @@ VULKAN_LIB_DEPS = \
        -lm
 
 if HAVE_PLATFORM_ANDROID
-VULKAN_CPPFLAGS += $(ANDROID_CPPFLAGS)
+VULKAN_CPPFLAGS += \
+    $(ANDROID_CPPFLAGS) \
+    -DVK_USE_PLATFORM_ANDROID_KHR
+
 VULKAN_CFLAGS += $(ANDROID_CFLAGS)
 VULKAN_LIB_DEPS += $(ANDROID_LIBS)
 VULKAN_SOURCES += $(VULKAN_ANDROID_FILES)
@@ -193,6 +195,21 @@ VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)
 VULKAN_LIB_DEPS += $(WAYLAND_CLIENT_LIBS)
 endif
 
+if HAVE_PLATFORM_DRM
+VULKAN_CPPFLAGS += \
+       -DVK_USE_PLATFORM_DISPLAY_KHR
+
+VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES)
+endif
+
+if HAVE_XLIB_LEASE
+VULKAN_CPPFLAGS += \
+       -DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
+       $(XCB_RANDR_CFLAGS) \
+       $(XLIB_RANDR_CFLAGS)
+VULKAN_LIB_DEPS += $(XCB_RANDR_LIBS)
+endif
+
 noinst_LTLIBRARIES += vulkan/libvulkan_common.la
 vulkan_libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
 vulkan_libvulkan_common_la_CFLAGS = $(VULKAN_CFLAGS)