diff options
Diffstat (limited to 'src/vulkan')
| -rw-r--r-- | src/vulkan/Android.mk | 4 | ||||
| -rw-r--r-- | src/vulkan/Makefile.am | 5 | ||||
| -rw-r--r-- | src/vulkan/meson.build | 1 | ||||
| -rw-r--r-- | src/vulkan/registry/vk_android_native_buffer.xml | 52 |
4 files changed, 2 insertions, 60 deletions
diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk index 70b23eae08f..6253f1c3be9 100644 --- a/src/vulkan/Android.mk +++ b/src/vulkan/Android.mk @@ -45,15 +45,13 @@ LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, \ LOCAL_SRC_FILES := $(VULKAN_UTIL_FILES) $(VULKAN_WSI_FILES) vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml -vk_android_native_buffer_xml = $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml $(LOCAL_GENERATED_SOURCES): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \ - $(vulkan_api_xml) $(vk_android_native_buffer_xml) + $(vulkan_api_xml) @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \ --xml $(vulkan_api_xml) \ - --xml $(vk_android_native_buffer_xml) \ --outdir $(dir $@) LOCAL_EXPORT_C_INCLUDE_DIRS := \ diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index bbcf7d0cc64..3da03ed09e1 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -4,13 +4,11 @@ noinst_LTLIBRARIES = libvulkan_wsi.la libvulkan_util.la vulkan_includedir = $(includedir)/vulkan 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 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) EXTRA_DIST = \ - $(top_srcdir)/include/vulkan/vk_android_native_buffer.h \ util/gen_enum_to_str.py \ util/meson.build \ wsi/meson.build \ @@ -21,11 +19,10 @@ VULKAN_UTIL_SOURCES = \ $(VULKAN_UTIL_GENERATED_FILES) util/vk_enum_to_str.c util/vk_enum_to_str.h: util/gen_enum_to_str.py \ - $(vulkan_api_xml) $(vk_android_native_buffer_xml) + $(vulkan_api_xml) $(MKDIR_GEN) $(PYTHON_GEN) $(srcdir)/util/gen_enum_to_str.py \ --xml $(vulkan_api_xml) \ - --xml $(vk_android_native_buffer_xml) \ --outdir $(top_builddir)/src/vulkan/util libvulkan_util_la_SOURCES = $(VULKAN_UTIL_SOURCES) diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build index 3908005b8a0..59e1fd1fabe 100644 --- a/src/vulkan/meson.build +++ b/src/vulkan/meson.build @@ -19,7 +19,6 @@ # SOFTWARE. vk_api_xml = files('registry/vk.xml') -vk_android_native_buffer_xml = files('registry/vk_android_native_buffer.xml') inc_vulkan_util = include_directories('util') inc_vulkan_wsi = include_directories('wsi') diff --git a/src/vulkan/registry/vk_android_native_buffer.xml b/src/vulkan/registry/vk_android_native_buffer.xml deleted file mode 100644 index 2738908aa71..00000000000 --- a/src/vulkan/registry/vk_android_native_buffer.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<registry> - <types> - <type category="struct" name="VkNativeBufferANDROID"> - <member values="VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member><type>buffer_handle_t</type> <name>handle</name></member> - <member><type>int</type> <name>stride</name></member> - <member><type>int</type> <name>format</name></member> - <member><type>int</type> <name>usage</name></member> - </type> - </types> - <commands> - <command> - <proto><type>VkResult</type> <name>vkGetSwapchainGrallocUsageANDROID</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkFormat</type> <name>format</name></param> - <param><type>VkImageUsageFlags</type> <name>imageUsage</name></param> - <param><type>int</type>* <name>grallocUsage</name></param> - </command> - <command> - <proto><type>VkResult</type> <name>vkAcquireImageANDROID</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkImage</type> <name>image</name></param> - <param><type>int</type> <name>nativeFenceFd</name></param> - <param><type>VkSemaphore</type> <name>semaphore</name></param> - <param><type>VkFence</type> <name>fence</name></param> - </command> - <command> - <proto><type>VkResult</type> <name>vkQueueSignalReleaseImageANDROID</name></proto> - <param><type>VkQueue</type> <name>queue</name></param> - <param><type>uint32_t</type> <name>waitSemaphoreCount</name></param> - <param>const <type>VkSemaphore</type>* <name>pWaitSemaphores</name></param> - <param><type>VkImage</type> <name>image</name></param> - <param><type>int</type>* <name>pNativeFenceFd</name></param> - </command> - </commands> - <extensions> - <extension name="VK_ANDROID_native_buffer" number="11" type="device" protect="ANDROID" supported="vulkan"> - <require> - <enum value="5" name="VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION"/> - <enum value="11" name="VK_ANDROID_NATIVE_BUFFER_NUMBER"/> - <enum value=""VK_ANDROID_native_buffer"" name="VK_ANDROID_NATIVE_BUFFER_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID"/> - <type name="VkNativeBufferANDROID"/> - <command name="vkGetSwapchainGrallocUsageANDROID"/> - <command name="vkAcquireImageANDROID"/> - <command name="vkQueueSignalReleaseImageANDROID"/> - </require> - </extension> - </extensions> -</registry> |