From 8baf86d923fb0cdd0e53bdff9d966d9d382d2e2a Mon Sep 17 00:00:00 2001 From: Taekyun Kim Date: Tue, 10 May 2016 14:50:04 +0900 Subject: [PATCH] wsi: Add devel package Vendors should use devel package for their drivers to work correctly with tizen vulkan WSI. Change-Id: Ie4bcfc6ef6d771b8a286857fd423c4f1c1238c6c --- packaging/vulkan-wsi-tizen.spec | 12 ++++++++++++ src/wsi/Makefile.am | 3 +++ src/wsi/vulkan-wsi-tizen.h | 11 +++++++++++ src/wsi/wsi.h | 5 +++-- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/wsi/vulkan-wsi-tizen.h diff --git a/packaging/vulkan-wsi-tizen.spec b/packaging/vulkan-wsi-tizen.spec index 4a71811..13b924b 100644 --- a/packaging/vulkan-wsi-tizen.spec +++ b/packaging/vulkan-wsi-tizen.spec @@ -26,9 +26,17 @@ Summary: Vulkan sample Group: Graphics & UI Framework/Hardware Adaptation Requires: %{name} = %{version}-%{release} +%package devel +Summary: Development package for tizen vulkan driver +Group: Graphics & UI Framework/Hardware Adaptation +Requires: %{name} = %{version}-%{release} + %description samples Vulkan WSI (Window System Integration) sample with null-driver for Test +%description devel +Development packages for tizen vulkan driver + %prep %setup -q @@ -55,3 +63,7 @@ cp %{_builddir}/%{buildsubdir}/samples/vulkaninfo %{buildroot}/%{_bindir} %{_libdir}/vulkan/null-driver.so %{_bindir}/tri %{_bindir}/vulkaninfo + +%files devel +%defattr(-,root,root,-) +%{_includedir}/vulkan/vulkan-wsi-tizen.h diff --git a/src/wsi/Makefile.am b/src/wsi/Makefile.am index a7325a7..4646ae1 100644 --- a/src/wsi/Makefile.am +++ b/src/wsi/Makefile.am @@ -3,6 +3,9 @@ moduledir = $(libdir)/vulkan AM_CFLAGS = $(GCC_CFLAGS) +vulkan_wsi_tizen_includedir = $(includedir)/vulkan +vulkan_wsi_tizen_include_HEADERS = vulkan-wsi-tizen.h + vulkan_wsi_tizen_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include \ -I$(top_srcdir)/src/utils \ -fvisibility=hidden \ diff --git a/src/wsi/vulkan-wsi-tizen.h b/src/wsi/vulkan-wsi-tizen.h new file mode 100644 index 0000000..6553053 --- /dev/null +++ b/src/wsi/vulkan-wsi-tizen.h @@ -0,0 +1,11 @@ +#ifndef VULKAN_WSI_TIZEN_H +#define VULKAN_WSI_TIZEN_H + +#include +#include +#include + +VkImage +vk_create_presentable_image(VkDevice device, const VkImageCreateInfo *info, tbm_surface_h buffer); + +#endif /* VULKAN_WSI_TIZEN_H */ diff --git a/src/wsi/wsi.h b/src/wsi/wsi.h index b1dd0f3..3d67fe7 100644 --- a/src/wsi/wsi.h +++ b/src/wsi/wsi.h @@ -27,8 +27,8 @@ #include #include +#include "vulkan-wsi-tizen.h" #include -#include #include #include @@ -81,7 +81,8 @@ PFN_vkVoidFunction vk_icd_get_proc_addr(VkInstance instance, const char *name); VkImage -vk_icd_create_presentable_image(VkDevice, const VkImageCreateInfo *, tbm_surface_h); +vk_icd_create_presentable_image(VkDevice device, const VkImageCreateInfo *info, + tbm_surface_h buffer); /* Entry point proto types. */ VKAPI_ATTR VkResult VKAPI_CALL -- 2.7.4