From: Alexander Galazin Date: Fri, 11 Oct 2019 09:58:07 +0000 (+0200) Subject: Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6 X-Git-Tag: upstream/1.3.5~1624^2~50 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=363d60136fa8fbce8a84c052ce5433ecb26fe57e;p=platform%2Fupstream%2FVK-GL-CTS.git Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6 Change-Id: Ife971c6779bf35094b5a72a87abaa47a6901530b --- 363d60136fa8fbce8a84c052ce5433ecb26fe57e diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl index a43b53e,fc4422e..3f03a73 --- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl +++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl @@@ -22,45 -22,45 +22,46 @@@ #define VK_WHOLE_SIZE (static_cast ((~0ULL))) #define VK_TRUE (static_cast (1)) #define VK_FALSE (static_cast (0)) + #define VK_API_MAX_FRAMEWORK_VERSION VK_API_VERSION_1_1 -VK_DEFINE_HANDLE (VkInstance, HANDLE_TYPE_INSTANCE); -VK_DEFINE_HANDLE (VkPhysicalDevice, HANDLE_TYPE_PHYSICAL_DEVICE); -VK_DEFINE_HANDLE (VkDevice, HANDLE_TYPE_DEVICE); -VK_DEFINE_HANDLE (VkQueue, HANDLE_TYPE_QUEUE); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkSemaphore, HANDLE_TYPE_SEMAPHORE); -VK_DEFINE_HANDLE (VkCommandBuffer, HANDLE_TYPE_COMMAND_BUFFER); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkFence, HANDLE_TYPE_FENCE); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDeviceMemory, HANDLE_TYPE_DEVICE_MEMORY); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkBuffer, HANDLE_TYPE_BUFFER); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkImage, HANDLE_TYPE_IMAGE); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkEvent, HANDLE_TYPE_EVENT); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkQueryPool, HANDLE_TYPE_QUERY_POOL); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkBufferView, HANDLE_TYPE_BUFFER_VIEW); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkImageView, HANDLE_TYPE_IMAGE_VIEW); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkShaderModule, HANDLE_TYPE_SHADER_MODULE); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkPipelineCache, HANDLE_TYPE_PIPELINE_CACHE); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkPipelineLayout, HANDLE_TYPE_PIPELINE_LAYOUT); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkRenderPass, HANDLE_TYPE_RENDER_PASS); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkPipeline, HANDLE_TYPE_PIPELINE); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDescriptorSetLayout, HANDLE_TYPE_DESCRIPTOR_SET_LAYOUT); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkSampler, HANDLE_TYPE_SAMPLER); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDescriptorPool, HANDLE_TYPE_DESCRIPTOR_POOL); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDescriptorSet, HANDLE_TYPE_DESCRIPTOR_SET); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkFramebuffer, HANDLE_TYPE_FRAMEBUFFER); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkCommandPool, HANDLE_TYPE_COMMAND_POOL); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkSamplerYcbcrConversion, HANDLE_TYPE_SAMPLER_YCBCR_CONVERSION); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDescriptorUpdateTemplate, HANDLE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkSurfaceKHR, HANDLE_TYPE_SURFACE_KHR); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkSwapchainKHR, HANDLE_TYPE_SWAPCHAIN_KHR); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDisplayKHR, HANDLE_TYPE_DISPLAY_KHR); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDisplayModeKHR, HANDLE_TYPE_DISPLAY_MODE_KHR); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDebugReportCallbackEXT, HANDLE_TYPE_DEBUG_REPORT_CALLBACK_EXT); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkObjectTableNVX, HANDLE_TYPE_OBJECT_TABLE_NVX); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkIndirectCommandsLayoutNVX, HANDLE_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDebugUtilsMessengerEXT, HANDLE_TYPE_DEBUG_UTILS_MESSENGER_EXT); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkValidationCacheEXT, HANDLE_TYPE_VALIDATION_CACHE_EXT); -VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkAccelerationStructureNV, HANDLE_TYPE_ACCELERATION_STRUCTURE_NV); +VK_DEFINE_HANDLE (VkInstance, HANDLE_TYPE_INSTANCE); +VK_DEFINE_HANDLE (VkPhysicalDevice, HANDLE_TYPE_PHYSICAL_DEVICE); +VK_DEFINE_HANDLE (VkDevice, HANDLE_TYPE_DEVICE); +VK_DEFINE_HANDLE (VkQueue, HANDLE_TYPE_QUEUE); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkSemaphore, HANDLE_TYPE_SEMAPHORE); +VK_DEFINE_HANDLE (VkCommandBuffer, HANDLE_TYPE_COMMAND_BUFFER); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkFence, HANDLE_TYPE_FENCE); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDeviceMemory, HANDLE_TYPE_DEVICE_MEMORY); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkBuffer, HANDLE_TYPE_BUFFER); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkImage, HANDLE_TYPE_IMAGE); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkEvent, HANDLE_TYPE_EVENT); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkQueryPool, HANDLE_TYPE_QUERY_POOL); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkBufferView, HANDLE_TYPE_BUFFER_VIEW); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkImageView, HANDLE_TYPE_IMAGE_VIEW); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkShaderModule, HANDLE_TYPE_SHADER_MODULE); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkPipelineCache, HANDLE_TYPE_PIPELINE_CACHE); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkPipelineLayout, HANDLE_TYPE_PIPELINE_LAYOUT); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkRenderPass, HANDLE_TYPE_RENDER_PASS); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkPipeline, HANDLE_TYPE_PIPELINE); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDescriptorSetLayout, HANDLE_TYPE_DESCRIPTOR_SET_LAYOUT); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkSampler, HANDLE_TYPE_SAMPLER); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDescriptorPool, HANDLE_TYPE_DESCRIPTOR_POOL); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDescriptorSet, HANDLE_TYPE_DESCRIPTOR_SET); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkFramebuffer, HANDLE_TYPE_FRAMEBUFFER); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkCommandPool, HANDLE_TYPE_COMMAND_POOL); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkSamplerYcbcrConversion, HANDLE_TYPE_SAMPLER_YCBCR_CONVERSION); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDescriptorUpdateTemplate, HANDLE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkSurfaceKHR, HANDLE_TYPE_SURFACE_KHR); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkSwapchainKHR, HANDLE_TYPE_SWAPCHAIN_KHR); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDisplayKHR, HANDLE_TYPE_DISPLAY_KHR); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDisplayModeKHR, HANDLE_TYPE_DISPLAY_MODE_KHR); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDebugReportCallbackEXT, HANDLE_TYPE_DEBUG_REPORT_CALLBACK_EXT); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkObjectTableNVX, HANDLE_TYPE_OBJECT_TABLE_NVX); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkIndirectCommandsLayoutNVX, HANDLE_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkDebugUtilsMessengerEXT, HANDLE_TYPE_DEBUG_UTILS_MESSENGER_EXT); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkValidationCacheEXT, HANDLE_TYPE_VALIDATION_CACHE_EXT); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkAccelerationStructureNV, HANDLE_TYPE_ACCELERATION_STRUCTURE_NV); +VK_DEFINE_NON_DISPATCHABLE_HANDLE (VkPerformanceConfigurationINTEL, HANDLE_TYPE_PERFORMANCE_CONFIGURATION_INTEL); enum VkPipelineCacheHeaderVersion { diff --cc external/vulkancts/modules/vulkan/vktTestCase.hpp index 6637dcc,cf6a0e4..0e55344 --- a/external/vulkancts/modules/vulkan/vktTestCase.hpp +++ b/external/vulkancts/modules/vulkan/vktTestCase.hpp @@@ -76,28 -79,25 +77,28 @@@ public #include "vkDeviceFeaturesForContextDecl.inl" - const vk::VkPhysicalDeviceProperties& getDeviceProperties (void) const; - const std::vector& getDeviceExtensions (void) const; - vk::VkDevice getDevice (void) const; - const vk::DeviceInterface& getDeviceInterface (void) const; - deUint32 getUniversalQueueFamilyIndex (void) const; - vk::VkQueue getUniversalQueue (void) const; - deUint32 getUsedApiVersion (void) const; - deUint32 getSparseQueueFamilyIndex (void) const; - vk::VkQueue getSparseQueue (void) const; - vk::Allocator& getDefaultAllocator (void) const; - bool contextSupports (const deUint32 majorNum, const deUint32 minorNum, const deUint32 patchNum) const; - bool contextSupports (const vk::ApiVersion version) const; - bool contextSupports (const deUint32 requiredApiVersionBits) const; - bool requireDeviceExtension (const std::string& required); - bool requireInstanceExtension (const std::string& required); - bool requireDeviceCoreFeature (const DeviceCoreFeature requiredDeviceCoreFeature); - - void* getInstanceProcAddr (); + const vk::VkPhysicalDeviceProperties& getDeviceProperties (void) const; + const std::vector& getDeviceExtensions (void) const; + vk::VkDevice getDevice (void) const; + const vk::DeviceInterface& getDeviceInterface (void) const; + deUint32 getUniversalQueueFamilyIndex (void) const; + vk::VkQueue getUniversalQueue (void) const; + deUint32 getUsedApiVersion (void) const; + deUint32 getSparseQueueFamilyIndex (void) const; + vk::VkQueue getSparseQueue (void) const; + vk::Allocator& getDefaultAllocator (void) const; + bool contextSupports (const deUint32 majorNum, const deUint32 minorNum, const deUint32 patchNum) const; + bool contextSupports (const vk::ApiVersion version) const; + bool contextSupports (const deUint32 requiredApiVersionBits) const; + bool requireDeviceExtension (const std::string& required); + bool requireInstanceExtension (const std::string& required); + bool requireDeviceCoreFeature (const DeviceCoreFeature requiredDeviceCoreFeature); + + void* getInstanceProcAddr (); + bool resultSetOnValidation () const { return m_resultSetOnValidation; } + void resultSetOnValidation (bool value) { m_resultSetOnValidation = value; } + protected: tcu::TestContext& m_testCtx; const vk::PlatformInterface& m_platformInterface; @@@ -106,11 -106,9 +107,11 @@@ const de::UniquePtr m_device; const de::UniquePtr m_allocator; + bool m_resultSetOnValidation; + private: - Context (const Context&); // Not allowed - Context& operator= (const Context&); // Not allowed + Context (const Context&); // Not allowed + Context& operator= (const Context&); // Not allowed }; class TestInstance;