From: Slawomir Cygan Date: Mon, 7 Dec 2020 14:31:05 +0000 (+0100) Subject: Remove merge conflict markers from mandatory_features.txt X-Git-Tag: upstream/1.3.5~1102 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ab93f6fc5022105024f7dfd13a65502a47d5f6c;p=platform%2Fupstream%2FVK-GL-CTS.git Remove merge conflict markers from mandatory_features.txt Also fixes same spacing. Components: Vulkan, Framework Change-Id: Ia1822f58ed05dc6348b72f2b0711fd60b62beedf --- diff --git a/external/vulkancts/scripts/src/mandatory_features.txt b/external/vulkancts/scripts/src/mandatory_features.txt index 7051a93..4734461 100644 --- a/external/vulkancts/scripts/src/mandatory_features.txt +++ b/external/vulkancts/scripts/src/mandatory_features.txt @@ -86,9 +86,6 @@ VkPhysicalDeviceVulkan12Features FEATURES ( samplerMirrorClampToEdge ) VkPhysicalDeviceVulkan12Features FEATURES ( samplerFilterMinmax ) REQUIREMENTS ( "ApiVersion(1, 2, 0)" VK_EXT_sampler_filter_minmax ) VkPhysicalDeviceVulkan12Features FEATURES ( shaderOutputViewportIndex ) REQUIREMENTS ( "ApiVersion(1, 2, 0)" VK_EXT_shader_viewport_index_layer ) VkPhysicalDeviceVulkan12Features FEATURES ( shaderOutputLayer ) REQUIREMENTS ( "ApiVersion(1, 2, 0)" VK_EXT_shader_viewport_index_layer ) -<<<<<<< HEAD VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR FEATURES ( shaderTerminateInvocation ) REQUIREMENTS ( VK_KHR_shader_terminate_invocation ) VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT FEATURES ( shaderImageInt64Atomics ) REQUIREMENTS ( VK_EXT_shader_image_atomic_int64 ) -======= -VkPhysicalDevice4444FormatsFeaturesEXT FEATURES ( formatA4R4G4B4 ) REQUIREMENTS ( VK_EXT_4444_formats ) ->>>>>>> 91ed2fec3... Add tests for VK_EXT_4444_formats +VkPhysicalDevice4444FormatsFeaturesEXT FEATURES ( formatA4R4G4B4 ) REQUIREMENTS ( VK_EXT_4444_formats ) \ No newline at end of file