dynamic selection of image tiling depending on suppot status

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2212ce788b6024c9c75491bc8e0852f000ffb037..5269a7fba54ee9aa6fb70bedf618210769c408e6 100644 (file)
--- 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 f722c9c661a9a1e87dcaf17d0e0c613192ec9515..ff045951b976ba5735b9d88a8084a82c5db59af7 100644 (file)
--- 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 7d9555f6999d961637267b32d2ad4e2ba760f94d..d0bdc563715912856d5db1afc785535850609ceb 100644 (file)
--- 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;
 }