From ba1aef7bbd5fcc5fb7190995b4cbaf40b815fea6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Wed, 2 Sep 2020 22:31:37 +0000 Subject: [PATCH] dynamic selection of image tiling depending on suppot status --- CMakeLists.txt | 7 ++----- src/vkvg_internal.h | 3 ++- tests/common/vkengine.c | 12 ------------ 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2212ce7..5269a7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,11 +54,6 @@ IF (VKVG_PREMULT_ALPHA) ADD_DEFINITIONS (-DVKVG_PREMULT_ALPHA) ENDIF () -OPTION(VKVG_TILING_OPTIMAL "use VK_IMAGE_TILING_OPTIMAL for surface backend texture" OFF) -IF (VKVG_TILING_OPTIMAL) - ADD_DEFINITIONS (-DVKVG_TILING_OPTIMAL) -ENDIF () - SET(VULKAN_SDK "$ENV{VULKAN_SDK}" CACHE STRING "LunarG Vulkan SDK path") IF (VULKAN_SDK) SET(ENV{VULKAN_SDK} ${VULKAN_SDK}) @@ -255,6 +250,7 @@ ENDIF () IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") INCLUDE(InstallRequiredSystemLibraries) + set(CPACK_ADD_LDCONFIG_CALL 1) SET(CPACK_SET_DESTDIR "on") SET(CPACK_PACKAGING_INSTALL_PREFIX "/tmp") SET(CPACK_GENERATOR "DEB") @@ -279,5 +275,6 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") SET(CPACK_COMPONENTS_ALL Libraries ApplicationData) + INCLUDE(CPack) ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") diff --git a/src/vkvg_internal.h b/src/vkvg_internal.h index f722c9c..ff04595 100644 --- a/src/vkvg_internal.h +++ b/src/vkvg_internal.h @@ -69,6 +69,7 @@ //used to store clipping bit on context saving. 8 bit stencil will allow 6 save/restore layer #define FB_STENCIL_FORMAT VK_FORMAT_S8_UINT #define FB_COLOR_FORMAT VK_FORMAT_B8G8R8A8_UNORM -#define VKVG_SURFACE_IMGS_REQUIREMENTS VK_IMAGE_USAGE_SAMPLED_BIT|VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT|VK_IMAGE_USAGE_TRANSFER_DST_BIT|VK_IMAGE_USAGE_TRANSFER_SRC_BIT +#define VKVG_SURFACE_IMGS_REQUIREMENTS VK_IMAGE_USAGE_SAMPLED_BIT|VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT|\ + VK_IMAGE_USAGE_TRANSFER_DST_BIT|VK_IMAGE_USAGE_TRANSFER_SRC_BIT|VK_FORMAT_FEATURE_BLIT_SRC_BIT #define VKVG_FENCE_TIMEOUT UINT64_MAX #endif diff --git a/tests/common/vkengine.c b/tests/common/vkengine.c index 7d9555f..d0bdc56 100644 --- a/tests/common/vkengine.c +++ b/tests/common/vkengine.c @@ -28,16 +28,6 @@ #include "vkh_image.h" #include "vkh_device.h" -bool vkeCheckPhyPropBlitSource (VkEngine e) { - VkFormatProperties formatProps; - vkGetPhysicalDeviceFormatProperties(e->dev->phy, e->renderer->format, &formatProps); -#ifdef VKVG_TILING_OPTIMAL - return formatProps.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_SRC_BIT; -#else - return formatProps.linearTilingFeatures & VK_FORMAT_FEATURE_BLIT_SRC_BIT; -#endif -} - VkSampleCountFlagBits getMaxUsableSampleCount(VkSampleCountFlags counts) { if (counts & VK_SAMPLE_COUNT_64_BIT) { return VK_SAMPLE_COUNT_64_BIT; } @@ -190,8 +180,6 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR vkh_app_free_phyinfos (phyCount, phys); - vkeCheckPhyPropBlitSource (e); - return e; } -- 2.47.3