projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5534dd8)
Remove merge conflict markers from mandatory_features.txt
authorSlawomir Cygan <slawomir.cygan@intel.com>
Mon, 7 Dec 2020 14:31:05 +0000 (15:31 +0100)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Mon, 7 Dec 2020 20:59:25 +0000 (15:59 -0500)
Also fixes same spacing.

Components: Vulkan, Framework
Change-Id: Ia1822f58ed05dc6348b72f2b0711fd60b62beedf

external/vulkancts/scripts/src/mandatory_features.txt patch | blob | history

diff --git a/external/vulkancts/scripts/src/mandatory_features.txt b/external/vulkancts/scripts/src/mandatory_features.txt
index 7051a93..4734461 100644 (file)
--- 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
Domain: Graphics System / GL;