From 6cbd34be72b2b732fe4f8d60c850d52fb16f68bc Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Fri, 27 May 2016 08:41:29 -0700 Subject: [PATCH] Change unnamed enum VK_ constants to defines and update API Converting enum to target type causes narrowing conversion warnings on MSVC 2015. Change-Id: I51c41f7be0964de674c7b954469fbc523fddac5f --- .../vulkancts/framework/vulkan/vkBasicTypes.inl | 188 ++++++++++-------- .../framework/vulkan/vkConcreteDeviceInterface.inl | 5 + external/vulkancts/framework/vulkan/vkDefs.hpp | 10 - .../framework/vulkan/vkDeviceDriverImpl.inl | 25 +++ .../framework/vulkan/vkDeviceFunctionPointers.inl | 5 + .../framework/vulkan/vkFunctionPointerTypes.inl | 5 + .../vulkan/vkInitDeviceFunctionPointers.inl | 5 + .../framework/vulkan/vkNullDriverImpl.inl | 36 ++++ external/vulkancts/framework/vulkan/vkStrUtil.inl | 7 + .../vulkancts/framework/vulkan/vkStrUtilImpl.inl | 221 +++++++++++++-------- .../vulkancts/framework/vulkan/vkStructTypes.inl | 35 ++++ .../framework/vulkan/vkVirtualDeviceInterface.inl | 5 + external/vulkancts/gen_framework.py | 31 +-- .../binding_model/vktBindingShaderAccessTests.cpp | 74 +++---- .../modules/vulkan/draw/vktDrawCreateInfoUtil.cpp | 2 +- .../modules/vulkan/draw/vktDrawCreateInfoUtil.hpp | 2 +- .../modules/vulkan/draw/vktDrawImageObjectUtil.cpp | 16 +- .../modules/vulkan/draw/vktDrawIndirectTest.cpp | 2 +- .../dynamic_state/vktDynamicStateCBTests.cpp | 2 +- .../vktDynamicStateCreateInfoUtil.cpp | 2 +- .../vktDynamicStateCreateInfoUtil.hpp | 2 +- .../dynamic_state/vktDynamicStateDSTests.cpp | 12 +- .../vktDynamicStateImageObjectUtil.cpp | 16 +- .../dynamic_state/vktDynamicStateRSTests.cpp | 4 +- .../memory/vktMemoryPipelineBarrierTests.cpp | 122 ++++++------ .../query_pool/vktQueryPoolCreateInfoUtil.cpp | 2 +- .../query_pool/vktQueryPoolCreateInfoUtil.hpp | 2 +- .../query_pool/vktQueryPoolImageObjectUtil.cpp | 16 +- .../vulkancts/modules/vulkan/vktShaderLibrary.cpp | 20 +- .../modules/vulkan/vktSynchronization.cpp | 2 +- .../modules/vulkan/wsi/vktWsiSurfaceTests.cpp | 6 +- 31 files changed, 540 insertions(+), 342 deletions(-) diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl index a00b8e3..1338a29 100644 --- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl +++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl @@ -1,15 +1,19 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. */ -enum { VK_API_VERSION = VK_MAKE_VERSION(1, 0, 5) }; -enum { VK_MAX_PHYSICAL_DEVICE_NAME_SIZE = 256 }; -enum { VK_MAX_EXTENSION_NAME_SIZE = 256 }; -enum { VK_UUID_SIZE = 16 }; -enum { VK_MAX_MEMORY_TYPES = 32 }; -enum { VK_MAX_MEMORY_HEAPS = 16 }; -enum { VK_MAX_DESCRIPTION_SIZE = 256 }; -enum { VK_ATTACHMENT_UNUSED = (~0U) }; -enum { VK_SUBPASS_EXTERNAL = (~0U) }; +#define VK_API_VERSION (static_cast (VK_MAKE_VERSION(1, 0, 0))) +#define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE (static_cast (256)) +#define VK_MAX_EXTENSION_NAME_SIZE (static_cast (256)) +#define VK_UUID_SIZE (static_cast (16)) +#define VK_MAX_MEMORY_TYPES (static_cast (32)) +#define VK_MAX_MEMORY_HEAPS (static_cast (16)) +#define VK_MAX_DESCRIPTION_SIZE (static_cast (256)) +#define VK_ATTACHMENT_UNUSED (static_cast ((~0U))) +#define VK_SUBPASS_EXTERNAL (static_cast ((~0U))) +#define VK_QUEUE_FAMILY_IGNORED (static_cast ((~0U))) +#define VK_WHOLE_SIZE (static_cast ((~0ULL))) +#define VK_TRUE (static_cast (1)) +#define VK_FALSE (static_cast (0)) VK_DEFINE_HANDLE (VkInstance, HANDLE_TYPE_INSTANCE); VK_DEFINE_HANDLE (VkPhysicalDevice, HANDLE_TYPE_PHYSICAL_DEVICE); @@ -77,67 +81,71 @@ enum VkResult enum VkStructureType { - VK_STRUCTURE_TYPE_APPLICATION_INFO = 0, - VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO = 1, - VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO = 2, - VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO = 3, - VK_STRUCTURE_TYPE_SUBMIT_INFO = 4, - VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO = 5, - VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE = 6, - VK_STRUCTURE_TYPE_BIND_SPARSE_INFO = 7, - VK_STRUCTURE_TYPE_FENCE_CREATE_INFO = 8, - VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO = 9, - VK_STRUCTURE_TYPE_EVENT_CREATE_INFO = 10, - VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO = 11, - VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO = 12, - VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO = 13, - VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO = 14, - VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO = 15, - VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO = 16, - VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO = 17, - VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO = 18, - VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO = 19, - VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO = 20, - VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO = 21, - VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO = 22, - VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO = 23, - VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO = 24, - VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO = 25, - VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO = 26, - VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO = 27, - VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO = 28, - VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO = 29, - VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO = 30, - VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO = 31, - VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO = 32, - VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO = 33, - VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO = 34, - VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET = 35, - VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET = 36, - VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO = 37, - VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO = 38, - VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO = 39, - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO = 40, - VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO = 41, - VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO = 42, - VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO = 43, - VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER = 44, - VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER = 45, - VK_STRUCTURE_TYPE_MEMORY_BARRIER = 46, - VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO = 47, - VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO = 48, - VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR = 1000001000, - VK_STRUCTURE_TYPE_PRESENT_INFO_KHR = 1000001001, - VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR = 1000002000, - VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR = 1000002001, - VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR = 1000003000, - VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR = 1000004000, - VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR = 1000005000, - VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR = 1000006000, - VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR = 1000007000, - VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR = 1000008000, - VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR = 1000009000, - VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT = 1000011000, + VK_STRUCTURE_TYPE_APPLICATION_INFO = 0, + VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO = 1, + VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO = 2, + VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO = 3, + VK_STRUCTURE_TYPE_SUBMIT_INFO = 4, + VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO = 5, + VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE = 6, + VK_STRUCTURE_TYPE_BIND_SPARSE_INFO = 7, + VK_STRUCTURE_TYPE_FENCE_CREATE_INFO = 8, + VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO = 9, + VK_STRUCTURE_TYPE_EVENT_CREATE_INFO = 10, + VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO = 11, + VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO = 12, + VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO = 13, + VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO = 14, + VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO = 15, + VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO = 16, + VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO = 17, + VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO = 18, + VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO = 19, + VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO = 20, + VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO = 21, + VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO = 22, + VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO = 23, + VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO = 24, + VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO = 25, + VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO = 26, + VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO = 27, + VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO = 28, + VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO = 29, + VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO = 30, + VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO = 31, + VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO = 32, + VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO = 33, + VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO = 34, + VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET = 35, + VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET = 36, + VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO = 37, + VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO = 38, + VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO = 39, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO = 40, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO = 41, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO = 42, + VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO = 43, + VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER = 44, + VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER = 45, + VK_STRUCTURE_TYPE_MEMORY_BARRIER = 46, + VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO = 47, + VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO = 48, + VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR = 1000001000, + VK_STRUCTURE_TYPE_PRESENT_INFO_KHR = 1000001001, + VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR = 1000002000, + VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR = 1000002001, + VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR = 1000003000, + VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR = 1000004000, + VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR = 1000005000, + VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR = 1000006000, + VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR = 1000007000, + VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR = 1000008000, + VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR = 1000009000, + VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT = 1000011000, + VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD = 1000018000, + VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT = 1000022000, + VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT = 1000022001, + VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT = 1000022002, }; enum VkSystemAllocationScope @@ -581,8 +589,7 @@ enum VkFilter { VK_FILTER_NEAREST = 0, VK_FILTER_LINEAR = 1, - - VK_FILTER_LAST + VK_FILTER_CUBIC_IMG = 1000015000, }; enum VkSamplerMipmapMode @@ -684,7 +691,7 @@ enum VkSubpassContents enum VkColorSpaceKHR { - VK_COLORSPACE_SRGB_NONLINEAR_KHR = 0, + VK_COLOR_SPACE_SRGB_NONLINEAR_KHR = 0, VK_COLOR_SPACE_KHR_LAST }; @@ -742,21 +749,30 @@ enum VkDebugReportErrorEXT VK_DEBUG_REPORT_ERROR_EXT_LAST }; +enum VkRasterizationOrderAMD +{ + VK_RASTERIZATION_ORDER_STRICT_AMD = 0, + VK_RASTERIZATION_ORDER_RELAXED_AMD = 1, + + VK_RASTERIZATION_ORDER_AMD_LAST +}; + enum VkFormatFeatureFlagBits { - VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT = 0x00000001, - VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT = 0x00000002, - VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT = 0x00000004, - VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT = 0x00000008, - VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT = 0x00000010, - VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT = 0x00000020, - VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT = 0x00000040, - VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT = 0x00000080, - VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT = 0x00000100, - VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000200, - VK_FORMAT_FEATURE_BLIT_SRC_BIT = 0x00000400, - VK_FORMAT_FEATURE_BLIT_DST_BIT = 0x00000800, - VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT = 0x00001000, + VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT = 0x00000001, + VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT = 0x00000002, + VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT = 0x00000004, + VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT = 0x00000008, + VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT = 0x00000010, + VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT = 0x00000020, + VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT = 0x00000040, + VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT = 0x00000080, + VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT = 0x00000100, + VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000200, + VK_FORMAT_FEATURE_BLIT_SRC_BIT = 0x00000400, + VK_FORMAT_FEATURE_BLIT_DST_BIT = 0x00000800, + VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT = 0x00001000, + VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG = 0x00002000, }; typedef deUint32 VkFormatFeatureFlags; diff --git a/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl b/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl index 3a4a48a..348551c 100644 --- a/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl +++ b/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl @@ -127,3 +127,8 @@ virtual VkResult getSwapchainImagesKHR (VkDevice device, VkSwapchainKHR swapc virtual VkResult acquireNextImageKHR (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, deUint32* pImageIndex) const; virtual VkResult queuePresentKHR (VkQueue queue, const VkPresentInfoKHR* pPresentInfo) const; virtual VkResult createSharedSwapchainsKHR (VkDevice device, deUint32 swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains) const; +virtual VkResult debugMarkerSetObjectTagEXT (VkDevice device, VkDebugMarkerObjectTagInfoEXT* pTagInfo) const; +virtual VkResult debugMarkerSetObjectNameEXT (VkDevice device, VkDebugMarkerObjectNameInfoEXT* pNameInfo) const; +virtual void cmdDebugMarkerBeginEXT (VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const; +virtual void cmdDebugMarkerEndEXT (VkCommandBuffer commandBuffer) const; +virtual void cmdDebugMarkerInsertEXT (VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const; diff --git a/external/vulkancts/framework/vulkan/vkDefs.hpp b/external/vulkancts/framework/vulkan/vkDefs.hpp index 6d1bccb..60a8295 100644 --- a/external/vulkancts/framework/vulkan/vkDefs.hpp +++ b/external/vulkancts/framework/vulkan/vkDefs.hpp @@ -93,16 +93,6 @@ private: #include "vkBasicTypes.inl" -enum { VK_QUEUE_FAMILY_IGNORED = 0xffffffff }; -enum { VK_NO_ATTACHMENT = 0xffffffff }; - -enum -{ - VK_FALSE = 0, - VK_TRUE = 1, - VK_WHOLE_SIZE = (~0ULL), -}; - namespace wsi { diff --git a/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl b/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl index 4fa0e17..873f121 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl @@ -631,3 +631,28 @@ VkResult DeviceDriver::createSharedSwapchainsKHR (VkDevice device, deUint32 swap { return m_vk.createSharedSwapchainsKHR(device, swapchainCount, pCreateInfos, pAllocator, pSwapchains); } + +VkResult DeviceDriver::debugMarkerSetObjectTagEXT (VkDevice device, VkDebugMarkerObjectTagInfoEXT* pTagInfo) const +{ + return m_vk.debugMarkerSetObjectTagEXT(device, pTagInfo); +} + +VkResult DeviceDriver::debugMarkerSetObjectNameEXT (VkDevice device, VkDebugMarkerObjectNameInfoEXT* pNameInfo) const +{ + return m_vk.debugMarkerSetObjectNameEXT(device, pNameInfo); +} + +void DeviceDriver::cmdDebugMarkerBeginEXT (VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const +{ + m_vk.cmdDebugMarkerBeginEXT(commandBuffer, pMarkerInfo); +} + +void DeviceDriver::cmdDebugMarkerEndEXT (VkCommandBuffer commandBuffer) const +{ + m_vk.cmdDebugMarkerEndEXT(commandBuffer); +} + +void DeviceDriver::cmdDebugMarkerInsertEXT (VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const +{ + m_vk.cmdDebugMarkerInsertEXT(commandBuffer, pMarkerInfo); +} diff --git a/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl index 54b1d1b..5b0aa9e 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl @@ -127,3 +127,8 @@ GetSwapchainImagesKHRFunc getSwapchainImagesKHR; AcquireNextImageKHRFunc acquireNextImageKHR; QueuePresentKHRFunc queuePresentKHR; CreateSharedSwapchainsKHRFunc createSharedSwapchainsKHR; +DebugMarkerSetObjectTagEXTFunc debugMarkerSetObjectTagEXT; +DebugMarkerSetObjectNameEXTFunc debugMarkerSetObjectNameEXT; +CmdDebugMarkerBeginEXTFunc cmdDebugMarkerBeginEXT; +CmdDebugMarkerEndEXTFunc cmdDebugMarkerEndEXT; +CmdDebugMarkerInsertEXTFunc cmdDebugMarkerInsertEXT; diff --git a/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl b/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl index ca89c7c..b8615b3 100644 --- a/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl +++ b/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl @@ -170,3 +170,8 @@ typedef VKAPI_ATTR VkBool32 (VKAPI_CALL* GetPhysicalDeviceWin32PresentationSu typedef VKAPI_ATTR VkResult (VKAPI_CALL* CreateDebugReportCallbackEXTFunc) (VkInstance instance, const VkDebugReportCallbackCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDebugReportCallbackEXT* pCallback); typedef VKAPI_ATTR void (VKAPI_CALL* DestroyDebugReportCallbackEXTFunc) (VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks* pAllocator); typedef VKAPI_ATTR void (VKAPI_CALL* DebugReportMessageEXTFunc) (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, deInt32 messageCode, const char* pLayerPrefix, const char* pMessage); +typedef VKAPI_ATTR VkResult (VKAPI_CALL* DebugMarkerSetObjectTagEXTFunc) (VkDevice device, VkDebugMarkerObjectTagInfoEXT* pTagInfo); +typedef VKAPI_ATTR VkResult (VKAPI_CALL* DebugMarkerSetObjectNameEXTFunc) (VkDevice device, VkDebugMarkerObjectNameInfoEXT* pNameInfo); +typedef VKAPI_ATTR void (VKAPI_CALL* CmdDebugMarkerBeginEXTFunc) (VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* pMarkerInfo); +typedef VKAPI_ATTR void (VKAPI_CALL* CmdDebugMarkerEndEXTFunc) (VkCommandBuffer commandBuffer); +typedef VKAPI_ATTR void (VKAPI_CALL* CmdDebugMarkerInsertEXTFunc) (VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* pMarkerInfo); diff --git a/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl index 7f77893..167fa16 100644 --- a/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl @@ -127,3 +127,8 @@ m_vk.getSwapchainImagesKHR = (GetSwapchainImagesKHRFunc) GET_PROC_ADDR("vk m_vk.acquireNextImageKHR = (AcquireNextImageKHRFunc) GET_PROC_ADDR("vkAcquireNextImageKHR"); m_vk.queuePresentKHR = (QueuePresentKHRFunc) GET_PROC_ADDR("vkQueuePresentKHR"); m_vk.createSharedSwapchainsKHR = (CreateSharedSwapchainsKHRFunc) GET_PROC_ADDR("vkCreateSharedSwapchainsKHR"); +m_vk.debugMarkerSetObjectTagEXT = (DebugMarkerSetObjectTagEXTFunc) GET_PROC_ADDR("vkDebugMarkerSetObjectTagEXT"); +m_vk.debugMarkerSetObjectNameEXT = (DebugMarkerSetObjectNameEXTFunc) GET_PROC_ADDR("vkDebugMarkerSetObjectNameEXT"); +m_vk.cmdDebugMarkerBeginEXT = (CmdDebugMarkerBeginEXTFunc) GET_PROC_ADDR("vkCmdDebugMarkerBeginEXT"); +m_vk.cmdDebugMarkerEndEXT = (CmdDebugMarkerEndEXTFunc) GET_PROC_ADDR("vkCmdDebugMarkerEndEXT"); +m_vk.cmdDebugMarkerInsertEXT = (CmdDebugMarkerInsertEXTFunc) GET_PROC_ADDR("vkCmdDebugMarkerInsertEXT"); diff --git a/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl b/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl index fb4bafc..b7ff3df 100644 --- a/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl +++ b/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl @@ -1142,6 +1142,37 @@ VKAPI_ATTR void VKAPI_CALL debugReportMessageEXT (VkInstance instance, VkDebugRe DE_UNREF(pMessage); } +VKAPI_ATTR VkResult VKAPI_CALL debugMarkerSetObjectTagEXT (VkDevice device, VkDebugMarkerObjectTagInfoEXT* pTagInfo) +{ + DE_UNREF(device); + DE_UNREF(pTagInfo); + return VK_SUCCESS; +} + +VKAPI_ATTR VkResult VKAPI_CALL debugMarkerSetObjectNameEXT (VkDevice device, VkDebugMarkerObjectNameInfoEXT* pNameInfo) +{ + DE_UNREF(device); + DE_UNREF(pNameInfo); + return VK_SUCCESS; +} + +VKAPI_ATTR void VKAPI_CALL cmdDebugMarkerBeginEXT (VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* pMarkerInfo) +{ + DE_UNREF(commandBuffer); + DE_UNREF(pMarkerInfo); +} + +VKAPI_ATTR void VKAPI_CALL cmdDebugMarkerEndEXT (VkCommandBuffer commandBuffer) +{ + DE_UNREF(commandBuffer); +} + +VKAPI_ATTR void VKAPI_CALL cmdDebugMarkerInsertEXT (VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* pMarkerInfo) +{ + DE_UNREF(commandBuffer); + DE_UNREF(pMarkerInfo); +} + static const tcu::StaticFunctionLibrary::Entry s_platformFunctions[] = { VK_NULL_FUNC_ENTRY(vkCreateInstance, createInstance), @@ -1321,5 +1352,10 @@ static const tcu::StaticFunctionLibrary::Entry s_deviceFunctions[] = VK_NULL_FUNC_ENTRY(vkAcquireNextImageKHR, acquireNextImageKHR), VK_NULL_FUNC_ENTRY(vkQueuePresentKHR, queuePresentKHR), VK_NULL_FUNC_ENTRY(vkCreateSharedSwapchainsKHR, createSharedSwapchainsKHR), + VK_NULL_FUNC_ENTRY(vkDebugMarkerSetObjectTagEXT, debugMarkerSetObjectTagEXT), + VK_NULL_FUNC_ENTRY(vkDebugMarkerSetObjectNameEXT, debugMarkerSetObjectNameEXT), + VK_NULL_FUNC_ENTRY(vkCmdDebugMarkerBeginEXT, cmdDebugMarkerBeginEXT), + VK_NULL_FUNC_ENTRY(vkCmdDebugMarkerEndEXT, cmdDebugMarkerEndEXT), + VK_NULL_FUNC_ENTRY(vkCmdDebugMarkerInsertEXT, cmdDebugMarkerInsertEXT), }; diff --git a/external/vulkancts/framework/vulkan/vkStrUtil.inl b/external/vulkancts/framework/vulkan/vkStrUtil.inl index ca4d028..5722004 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtil.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtil.inl @@ -40,6 +40,7 @@ const char* getColorSpaceKHRName (VkColorSpaceKHR value); const char* getPresentModeKHRName (VkPresentModeKHR value); const char* getDebugReportObjectTypeEXTName (VkDebugReportObjectTypeEXT value); const char* getDebugReportErrorEXTName (VkDebugReportErrorEXT value); +const char* getRasterizationOrderAMDName (VkRasterizationOrderAMD value); inline tcu::Format::Enum getPipelineCacheHeaderVersionStr (VkPipelineCacheHeaderVersion value) { return tcu::Format::Enum(getPipelineCacheHeaderVersionName, value); } inline tcu::Format::Enum getResultStr (VkResult value) { return tcu::Format::Enum(getResultName, value); } @@ -80,6 +81,7 @@ inline tcu::Format::Enum getColorSpaceKHRStr (VkColorSpa inline tcu::Format::Enum getPresentModeKHRStr (VkPresentModeKHR value) { return tcu::Format::Enum(getPresentModeKHRName, value); } inline tcu::Format::Enum getDebugReportObjectTypeEXTStr (VkDebugReportObjectTypeEXT value) { return tcu::Format::Enum(getDebugReportObjectTypeEXTName, value); } inline tcu::Format::Enum getDebugReportErrorEXTStr (VkDebugReportErrorEXT value) { return tcu::Format::Enum(getDebugReportErrorEXTName, value); } +inline tcu::Format::Enum getRasterizationOrderAMDStr (VkRasterizationOrderAMD value) { return tcu::Format::Enum(getRasterizationOrderAMDName, value); } inline std::ostream& operator<< (std::ostream& s, VkPipelineCacheHeaderVersion value) { return s << getPipelineCacheHeaderVersionStr(value); } inline std::ostream& operator<< (std::ostream& s, VkResult value) { return s << getResultStr(value); } @@ -120,6 +122,7 @@ inline std::ostream& operator<< (std::ostream& s, VkColorSpaceKHR value) { re inline std::ostream& operator<< (std::ostream& s, VkPresentModeKHR value) { return s << getPresentModeKHRStr(value); } inline std::ostream& operator<< (std::ostream& s, VkDebugReportObjectTypeEXT value) { return s << getDebugReportObjectTypeEXTStr(value); } inline std::ostream& operator<< (std::ostream& s, VkDebugReportErrorEXT value) { return s << getDebugReportErrorEXTStr(value); } +inline std::ostream& operator<< (std::ostream& s, VkRasterizationOrderAMD value) { return s << getRasterizationOrderAMDStr(value); } tcu::Format::Bitfield<32> getFormatFeatureFlagsStr (VkFormatFeatureFlags value); tcu::Format::Bitfield<32> getImageUsageFlagsStr (VkImageUsageFlags value); @@ -319,3 +322,7 @@ std::ostream& operator<< (std::ostream& s, const VkMirSurfaceCreateInfoKHR& valu std::ostream& operator<< (std::ostream& s, const VkAndroidSurfaceCreateInfoKHR& value); std::ostream& operator<< (std::ostream& s, const VkWin32SurfaceCreateInfoKHR& value); std::ostream& operator<< (std::ostream& s, const VkDebugReportCallbackCreateInfoEXT& value); +std::ostream& operator<< (std::ostream& s, const VkPipelineRasterizationStateRasterizationOrderAMD& value); +std::ostream& operator<< (std::ostream& s, const VkDebugMarkerObjectNameInfoEXT& value); +std::ostream& operator<< (std::ostream& s, const VkDebugMarkerObjectTagInfoEXT& value); +std::ostream& operator<< (std::ostream& s, const VkDebugMarkerMarkerInfoEXT& value); diff --git a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl index 4b6e3f7..5b9555d 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl @@ -94,68 +94,72 @@ const char* getStructureTypeName (VkStructureType value) { switch (value) { - case VK_STRUCTURE_TYPE_APPLICATION_INFO: return "VK_STRUCTURE_TYPE_APPLICATION_INFO"; - case VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO: return "VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO: return "VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO: return "VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_SUBMIT_INFO: return "VK_STRUCTURE_TYPE_SUBMIT_INFO"; - case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO: return "VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO"; - case VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE: return "VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE"; - case VK_STRUCTURE_TYPE_BIND_SPARSE_INFO: return "VK_STRUCTURE_TYPE_BIND_SPARSE_INFO"; - case VK_STRUCTURE_TYPE_FENCE_CREATE_INFO: return "VK_STRUCTURE_TYPE_FENCE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO: return "VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_EVENT_CREATE_INFO: return "VK_STRUCTURE_TYPE_EVENT_CREATE_INFO"; - case VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO: return "VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO"; - case VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO: return "VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO"; - case VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO: return "VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO"; - case VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO: return "VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO: return "VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO"; - case VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO: return "VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO: return "VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO: return "VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO"; - case VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO: return "VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO"; - case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO: return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO"; - case VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO: return "VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO"; - case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO: return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO"; - case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: return "VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET"; - case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: return "VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET"; - case VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO: return "VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO"; - case VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO: return "VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO"; - case VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO: return "VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO"; - case VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO: return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO"; - case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO: return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO"; - case VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO: return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO"; - case VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO: return "VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO"; - case VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER: return "VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER"; - case VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER: return "VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER"; - case VK_STRUCTURE_TYPE_MEMORY_BARRIER: return "VK_STRUCTURE_TYPE_MEMORY_BARRIER"; - case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO: return "VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: return "VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO"; - case VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR"; - case VK_STRUCTURE_TYPE_PRESENT_INFO_KHR: return "VK_STRUCTURE_TYPE_PRESENT_INFO_KHR"; - case VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR"; - case VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR"; - case VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR: return "VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR"; - case VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR"; - case VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR"; - case VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR"; - case VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR"; - case VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR"; - case VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR"; - case VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT: return "VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT"; - default: return DE_NULL; + case VK_STRUCTURE_TYPE_APPLICATION_INFO: return "VK_STRUCTURE_TYPE_APPLICATION_INFO"; + case VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO: return "VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO: return "VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO: return "VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_SUBMIT_INFO: return "VK_STRUCTURE_TYPE_SUBMIT_INFO"; + case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO: return "VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO"; + case VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE: return "VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE"; + case VK_STRUCTURE_TYPE_BIND_SPARSE_INFO: return "VK_STRUCTURE_TYPE_BIND_SPARSE_INFO"; + case VK_STRUCTURE_TYPE_FENCE_CREATE_INFO: return "VK_STRUCTURE_TYPE_FENCE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO: return "VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_EVENT_CREATE_INFO: return "VK_STRUCTURE_TYPE_EVENT_CREATE_INFO"; + case VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO: return "VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO"; + case VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO: return "VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO"; + case VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO: return "VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO"; + case VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO: return "VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO: return "VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO"; + case VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO: return "VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO: return "VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO: return "VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO: return "VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO"; + case VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO: return "VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO"; + case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO: return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO"; + case VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO: return "VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO"; + case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO: return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO"; + case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: return "VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET"; + case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: return "VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET"; + case VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO: return "VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO"; + case VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO: return "VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO"; + case VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO: return "VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO"; + case VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO: return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO"; + case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO: return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO"; + case VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO: return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO"; + case VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO: return "VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO"; + case VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER: return "VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER"; + case VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER: return "VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER"; + case VK_STRUCTURE_TYPE_MEMORY_BARRIER: return "VK_STRUCTURE_TYPE_MEMORY_BARRIER"; + case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO: return "VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: return "VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO"; + case VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR"; + case VK_STRUCTURE_TYPE_PRESENT_INFO_KHR: return "VK_STRUCTURE_TYPE_PRESENT_INFO_KHR"; + case VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR"; + case VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR"; + case VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR: return "VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR"; + case VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR"; + case VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR"; + case VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR"; + case VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR"; + case VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR"; + case VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR: return "VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR"; + case VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT: return "VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT"; + case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD: return "VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD"; + case VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT: return "VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT"; + case VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT: return "VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT"; + case VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT: return "VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT"; + default: return DE_NULL; } } @@ -644,9 +648,10 @@ const char* getFilterName (VkFilter value) { switch (value) { - case VK_FILTER_NEAREST: return "VK_FILTER_NEAREST"; - case VK_FILTER_LINEAR: return "VK_FILTER_LINEAR"; - default: return DE_NULL; + case VK_FILTER_NEAREST: return "VK_FILTER_NEAREST"; + case VK_FILTER_LINEAR: return "VK_FILTER_LINEAR"; + case VK_FILTER_CUBIC_IMG: return "VK_FILTER_CUBIC_IMG"; + default: return DE_NULL; } } @@ -771,7 +776,7 @@ const char* getColorSpaceKHRName (VkColorSpaceKHR value) { switch (value) { - case VK_COLORSPACE_SRGB_NONLINEAR_KHR: return "VK_COLORSPACE_SRGB_NONLINEAR_KHR"; + case VK_COLOR_SPACE_SRGB_NONLINEAR_KHR: return "VK_COLOR_SPACE_SRGB_NONLINEAR_KHR"; default: return DE_NULL; } } @@ -835,23 +840,34 @@ const char* getDebugReportErrorEXTName (VkDebugReportErrorEXT value) } } +const char* getRasterizationOrderAMDName (VkRasterizationOrderAMD value) +{ + switch (value) + { + case VK_RASTERIZATION_ORDER_STRICT_AMD: return "VK_RASTERIZATION_ORDER_STRICT_AMD"; + case VK_RASTERIZATION_ORDER_RELAXED_AMD: return "VK_RASTERIZATION_ORDER_RELAXED_AMD"; + default: return DE_NULL; + } +} + tcu::Format::Bitfield<32> getFormatFeatureFlagsStr (VkFormatFeatureFlags value) { static const tcu::Format::BitDesc s_desc[] = { - tcu::Format::BitDesc(VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT, "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT, "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT, "VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT, "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT, "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT, "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT, "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT, "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT, "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT, "VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_BLIT_SRC_BIT, "VK_FORMAT_FEATURE_BLIT_SRC_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_BLIT_DST_BIT, "VK_FORMAT_FEATURE_BLIT_DST_BIT"), - tcu::Format::BitDesc(VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT, "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT, "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT, "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT, "VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT, "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT, "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT, "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT, "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT, "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT, "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT, "VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_BLIT_SRC_BIT, "VK_FORMAT_FEATURE_BLIT_SRC_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_BLIT_DST_BIT, "VK_FORMAT_FEATURE_BLIT_DST_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT, "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT"), + tcu::Format::BitDesc(VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG, "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG"), }; return tcu::Format::Bitfield<32>(value, DE_ARRAY_BEGIN(s_desc), DE_ARRAY_END(s_desc)); } @@ -3208,3 +3224,50 @@ std::ostream& operator<< (std::ostream& s, const VkDebugReportCallbackCreateInfo s << '}'; return s; } + +std::ostream& operator<< (std::ostream& s, const VkPipelineRasterizationStateRasterizationOrderAMD& value) +{ + s << "VkPipelineRasterizationStateRasterizationOrderAMD = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\trasterizationOrder = " << value.rasterizationOrder << '\n'; + s << '}'; + return s; +} + +std::ostream& operator<< (std::ostream& s, const VkDebugMarkerObjectNameInfoEXT& value) +{ + s << "VkDebugMarkerObjectNameInfoEXT = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tobjectType = " << value.objectType << '\n'; + s << "\tobject = " << value.object << '\n'; + s << "\tpObjectName = " << getCharPtrStr(value.pObjectName) << '\n'; + s << '}'; + return s; +} + +std::ostream& operator<< (std::ostream& s, const VkDebugMarkerObjectTagInfoEXT& value) +{ + s << "VkDebugMarkerObjectTagInfoEXT = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tobjectType = " << value.objectType << '\n'; + s << "\tobject = " << value.object << '\n'; + s << "\ttagName = " << value.tagName << '\n'; + s << "\ttagSize = " << value.tagSize << '\n'; + s << "\tpTag = " << value.pTag << '\n'; + s << '}'; + return s; +} + +std::ostream& operator<< (std::ostream& s, const VkDebugMarkerMarkerInfoEXT& value) +{ + s << "VkDebugMarkerMarkerInfoEXT = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tpMarkerName = " << getCharPtrStr(value.pMarkerName) << '\n'; + s << "\tcolor = " << '\n' << tcu::formatArray(DE_ARRAY_BEGIN(value.color), DE_ARRAY_END(value.color)) << '\n'; + s << '}'; + return s; +} diff --git a/external/vulkancts/framework/vulkan/vkStructTypes.inl b/external/vulkancts/framework/vulkan/vkStructTypes.inl index 804944c..059ada9 100644 --- a/external/vulkancts/framework/vulkan/vkStructTypes.inl +++ b/external/vulkancts/framework/vulkan/vkStructTypes.inl @@ -1372,3 +1372,38 @@ struct VkDebugReportCallbackCreateInfoEXT void* pUserData; }; +struct VkPipelineRasterizationStateRasterizationOrderAMD +{ + VkStructureType sType; + const void* pNext; + VkRasterizationOrderAMD rasterizationOrder; +}; + +struct VkDebugMarkerObjectNameInfoEXT +{ + VkStructureType sType; + const void* pNext; + VkDebugReportObjectTypeEXT objectType; + deUint64 object; + const char* pObjectName; +}; + +struct VkDebugMarkerObjectTagInfoEXT +{ + VkStructureType sType; + const void* pNext; + VkDebugReportObjectTypeEXT objectType; + deUint64 object; + deUint64 tagName; + deUintptr tagSize; + const void* pTag; +}; + +struct VkDebugMarkerMarkerInfoEXT +{ + VkStructureType sType; + const void* pNext; + const char* pMarkerName; + float color[4]; +}; + diff --git a/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl b/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl index 7c45099..e8fd689 100644 --- a/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl +++ b/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl @@ -127,3 +127,8 @@ virtual VkResult getSwapchainImagesKHR (VkDevice device, VkSwapchainKHR swapc virtual VkResult acquireNextImageKHR (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, deUint32* pImageIndex) const = 0; virtual VkResult queuePresentKHR (VkQueue queue, const VkPresentInfoKHR* pPresentInfo) const = 0; virtual VkResult createSharedSwapchainsKHR (VkDevice device, deUint32 swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains) const = 0; +virtual VkResult debugMarkerSetObjectTagEXT (VkDevice device, VkDebugMarkerObjectTagInfoEXT* pTagInfo) const = 0; +virtual VkResult debugMarkerSetObjectNameEXT (VkDevice device, VkDebugMarkerObjectNameInfoEXT* pNameInfo) const = 0; +virtual void cmdDebugMarkerBeginEXT (VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const = 0; +virtual void cmdDebugMarkerEndEXT (VkCommandBuffer commandBuffer) const = 0; +virtual void cmdDebugMarkerInsertEXT (VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const = 0; diff --git a/external/vulkancts/gen_framework.py b/external/vulkancts/gen_framework.py index e6d9e55..6a34af1 100644 --- a/external/vulkancts/gen_framework.py +++ b/external/vulkancts/gen_framework.py @@ -105,15 +105,19 @@ INSTANCE_FUNCTIONS = [ ] DEFINITIONS = [ - "VK_API_VERSION", - "VK_MAX_PHYSICAL_DEVICE_NAME_SIZE", - "VK_MAX_EXTENSION_NAME_SIZE", - "VK_UUID_SIZE", - "VK_MAX_MEMORY_TYPES", - "VK_MAX_MEMORY_HEAPS", - "VK_MAX_DESCRIPTION_SIZE", - "VK_ATTACHMENT_UNUSED", - "VK_SUBPASS_EXTERNAL" + ("VK_API_VERSION", "deUint32"), + ("VK_MAX_PHYSICAL_DEVICE_NAME_SIZE", "size_t"), + ("VK_MAX_EXTENSION_NAME_SIZE", "size_t"), + ("VK_UUID_SIZE", "size_t"), + ("VK_MAX_MEMORY_TYPES", "size_t"), + ("VK_MAX_MEMORY_HEAPS", "size_t"), + ("VK_MAX_DESCRIPTION_SIZE", "size_t"), + ("VK_ATTACHMENT_UNUSED", "deUint32"), + ("VK_SUBPASS_EXTERNAL", "deUint32"), + ("VK_QUEUE_FAMILY_IGNORED", "deUint32"), + ("VK_WHOLE_SIZE", "vk::VkDeviceSize"), + ("VK_TRUE", "vk::VkBool32"), + ("VK_FALSE", "vk::VkBool32"), ] PLATFORM_TYPES = [ @@ -219,13 +223,10 @@ def readFile (filename): IDENT_PTRN = r'[a-zA-Z_][a-zA-Z0-9_]*' TYPE_PTRN = r'[a-zA-Z_][a-zA-Z0-9_ \t*]*' -def endswith (s, postfix): - return len(s) >= len(postfix) and s[len(s)-len(postfix):] == postfix - def fixupEnumValues (values): fixed = [] for name, value in values: - if endswith(name, "_BEGIN_RANGE") or endswith(name, "_END_RANGE"): + if "_BEGIN_RANGE" in name or "_END_RANGE" in name: continue fixed.append((name, value)) return fixed @@ -372,7 +373,7 @@ def parseBitfieldNames (src): return matches def parseAPI (src): - definitions = [(name, parsePreprocDefinedValue(src, name)) for name in DEFINITIONS] + definitions = [(name, type, parsePreprocDefinedValue(src, name)) for name, type in DEFINITIONS] rawEnums = parseEnums(src) bitfieldNames = parseBitfieldNames(src) enums = [] @@ -476,7 +477,7 @@ def genHandlesSrc (handles): def writeBasicTypes (api, filename): def gen (): - for line in indentLines(["enum { %s\t= %s\t};" % define for define in api.definitions]): + for line in indentLines(["#define %s\t(static_cast<%s>\t(%s))" % (name, type, value) for name, type, value in api.definitions]): yield line yield "" for line in genHandlesSrc(api.handles): diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp index 270f2fb..da65f4b 100644 --- a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp +++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp @@ -427,7 +427,7 @@ vk::Move SingleTargetRenderInstance::createRenderPass (const v }; const vk::VkAttachmentReference depthStencilAttachment = { - vk::VK_NO_ATTACHMENT, // attachment + VK_ATTACHMENT_UNUSED, // attachment vk::VK_IMAGE_LAYOUT_UNDEFINED // layout }; const vk::VkSubpassDescription subpass = @@ -526,8 +526,8 @@ void SingleTargetRenderInstance::readRenderTarget (tcu::TextureLevel& dst) vk::VK_ACCESS_TRANSFER_READ_BIT, // dstAccessMask vk::VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, // oldLayout vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, // newLayout - vk::VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex - vk::VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex *m_colorAttachmentImage, // image fullSubrange, // subresourceRange }; @@ -537,8 +537,8 @@ void SingleTargetRenderInstance::readRenderTarget (tcu::TextureLevel& dst) DE_NULL, vk::VK_ACCESS_TRANSFER_WRITE_BIT, // srcAccessMask vk::VK_ACCESS_HOST_READ_BIT, // dstAccessMask - vk::VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex - vk::VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex *buffer, // buffer 0u, // offset (vk::VkDeviceSize)pixelDataSize // size @@ -656,8 +656,8 @@ tcu::TestStatus SingleTargetRenderInstance::iterate (void) vk::VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, // dstAccessMask vk::VK_IMAGE_LAYOUT_UNDEFINED, // oldLayout vk::VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, // newLayout - vk::VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex - vk::VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex *m_colorAttachmentImage, // image fullSubrange, // subresourceRange }; @@ -710,7 +710,7 @@ tcu::TestStatus SingleTargetRenderInstance::iterate (void) VK_CHECK(m_vki.queueSubmit(m_queue, 1u, &submitInfo, *fence)); } - VK_CHECK(m_vki.waitForFences(m_device, 1u, &fence.get(), vk::VK_TRUE, infiniteTimeout)); + VK_CHECK(m_vki.waitForFences(m_device, 1u, &fence.get(), VK_TRUE, infiniteTimeout)); // and then render to renderToTarget(); @@ -854,7 +854,7 @@ vk::Move SingleCmdRenderInstance::createPipeline (vk::VkPipeline DE_NULL, (vk::VkPipelineInputAssemblyStateCreateFlags)0, topology, // topology - vk::VK_FALSE, // primitiveRestartEnable + VK_FALSE, // primitiveRestartEnable }; const vk::VkPipelineTessellationStateCreateInfo tessState = { @@ -892,12 +892,12 @@ vk::Move SingleCmdRenderInstance::createPipeline (vk::VkPipeline vk::VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, DE_NULL, (vk::VkPipelineRasterizationStateCreateFlags)0, - vk::VK_TRUE, // depthClipEnable - vk::VK_FALSE, // rasterizerDiscardEnable + VK_TRUE, // depthClipEnable + VK_FALSE, // rasterizerDiscardEnable vk::VK_POLYGON_MODE_FILL, // fillMode vk::VK_CULL_MODE_NONE, // cullMode vk::VK_FRONT_FACE_COUNTER_CLOCKWISE, // frontFace - vk::VK_FALSE, // depthBiasEnable + VK_FALSE, // depthBiasEnable 0.0f, // depthBias 0.0f, // depthBiasClamp 0.0f, // slopeScaledDepthBias @@ -910,22 +910,22 @@ vk::Move SingleCmdRenderInstance::createPipeline (vk::VkPipeline DE_NULL, (vk::VkPipelineMultisampleStateCreateFlags)0, vk::VK_SAMPLE_COUNT_1_BIT, // rasterSamples - vk::VK_FALSE, // sampleShadingEnable + VK_FALSE, // sampleShadingEnable 0.0f, // minSampleShading &sampleMask, // sampleMask - vk::VK_FALSE, // alphaToCoverageEnable - vk::VK_FALSE, // alphaToOneEnable + VK_FALSE, // alphaToCoverageEnable + VK_FALSE, // alphaToOneEnable }; const vk::VkPipelineDepthStencilStateCreateInfo dsState = { vk::VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, DE_NULL, (vk::VkPipelineDepthStencilStateCreateFlags)0, - vk::VK_FALSE, // depthTestEnable - vk::VK_FALSE, // depthWriteEnable + VK_FALSE, // depthTestEnable + VK_FALSE, // depthWriteEnable vk::VK_COMPARE_OP_ALWAYS, // depthCompareOp - vk::VK_FALSE, // depthBoundsTestEnable - vk::VK_FALSE, // stencilTestEnable + VK_FALSE, // depthBoundsTestEnable + VK_FALSE, // stencilTestEnable { vk::VK_STENCIL_OP_KEEP, vk::VK_STENCIL_OP_KEEP, vk::VK_STENCIL_OP_KEEP, vk::VK_COMPARE_OP_ALWAYS, 0u, 0u, 0u }, // front { vk::VK_STENCIL_OP_KEEP, vk::VK_STENCIL_OP_KEEP, vk::VK_STENCIL_OP_KEEP, vk::VK_COMPARE_OP_ALWAYS, 0u, 0u, 0u }, // back -1.0f, // minDepthBounds @@ -933,7 +933,7 @@ vk::Move SingleCmdRenderInstance::createPipeline (vk::VkPipeline }; const vk::VkPipelineColorBlendAttachmentState cbAttachment = { - vk::VK_FALSE, // blendEnable + VK_FALSE, // blendEnable vk::VK_BLEND_FACTOR_ZERO, // srcBlendColor vk::VK_BLEND_FACTOR_ZERO, // destBlendColor vk::VK_BLEND_OP_ADD, // blendOpColor @@ -950,7 +950,7 @@ vk::Move SingleCmdRenderInstance::createPipeline (vk::VkPipeline vk::VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO, DE_NULL, (vk::VkPipelineColorBlendStateCreateFlags)0, - vk::VK_FALSE, // logicOpEnable + VK_FALSE, // logicOpEnable vk::VK_LOGIC_OP_CLEAR, // logicOp 1u, // attachmentCount &cbAttachment, // pAttachments @@ -1018,7 +1018,7 @@ void SingleCmdRenderInstance::renderToTarget (void) (vk::VkRenderPass)*m_renderPass, // renderPass 0u, // subpass (vk::VkFramebuffer)*m_framebuffer, // framebuffer - vk::VK_FALSE, // occlusionQueryEnable + VK_FALSE, // occlusionQueryEnable (vk::VkQueryControlFlags)0, (vk::VkQueryPipelineStatisticFlags)0, }; @@ -1583,8 +1583,8 @@ vk::VkBufferMemoryBarrier ComputeInstanceResultBuffer::createResultBufferBarrier DE_NULL, vk::VK_ACCESS_SHADER_WRITE_BIT, // outputMask vk::VK_ACCESS_HOST_READ_BIT, // inputMask - vk::VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex - vk::VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex buffer, // buffer (vk::VkDeviceSize)0u, // offset DATA_SIZE, // size @@ -2087,8 +2087,8 @@ tcu::TestStatus BufferComputeInstance::testResourceAccess (void) DE_NULL, vk::VK_ACCESS_HOST_WRITE_BIT, // outputMask inputBit, // inputMask - vk::VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex - vk::VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex *bufferA, // buffer (vk::VkDeviceSize)0u, // offset (vk::VkDeviceSize)bufferSizeA, // size @@ -2098,8 +2098,8 @@ tcu::TestStatus BufferComputeInstance::testResourceAccess (void) DE_NULL, vk::VK_ACCESS_HOST_WRITE_BIT, // outputMask inputBit, // inputMask - vk::VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex - vk::VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex *bufferB, // buffer (vk::VkDeviceSize)0u, // offset (vk::VkDeviceSize)bufferSizeB, // size @@ -3041,10 +3041,10 @@ void ImageInstanceImages::uploadImage (const vk::DeviceInterface& vki, { vk::VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, DE_NULL, - vk::VK_ACCESS_HOST_WRITE_BIT, // outputMask + vk::VK_ACCESS_HOST_WRITE_BIT, // outputMask vk::VK_ACCESS_TRANSFER_READ_BIT, // inputMask - vk::VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex - vk::VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex *dataBuffer, // buffer 0u, // offset dataBufferSize, // size @@ -3065,8 +3065,8 @@ void ImageInstanceImages::uploadImage (const vk::DeviceInterface& vki, vk::VK_ACCESS_TRANSFER_WRITE_BIT, // inputMask vk::VK_IMAGE_LAYOUT_UNDEFINED, // oldLayout vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, // newLayout - vk::VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex - vk::VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex image, // image fullSubrange // subresourceRange }; @@ -3078,8 +3078,8 @@ void ImageInstanceImages::uploadImage (const vk::DeviceInterface& vki, vk::VK_ACCESS_SHADER_READ_BIT, // inputMask vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, // oldLayout layout, // newLayout - vk::VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex - vk::VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex image, // image fullSubrange // subresourceRange }; @@ -5457,8 +5457,8 @@ vk::VkBufferMemoryBarrier TexelBufferInstanceBuffers::createBarrier (vk::VkDescr DE_NULL, vk::VK_ACCESS_HOST_WRITE_BIT, // outputMask inputBit, // inputMask - vk::VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex - vk::VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex + VK_QUEUE_FAMILY_IGNORED, // destQueueFamilyIndex buffer , // buffer 0u, // offset (vk::VkDeviceSize)BUFFER_SIZE // size diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp index 6f981de..bbe0caa 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp @@ -446,7 +446,7 @@ AttachmentReference::AttachmentReference (deUint32 _attachment, vk::VkImageLayou AttachmentReference::AttachmentReference (void) { - attachment = vk::VK_ATTACHMENT_UNUSED; + attachment = VK_ATTACHMENT_UNUSED; layout = vk::VK_IMAGE_LAYOUT_UNDEFINED; } diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.hpp b/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.hpp index 1733201..2c94cc3 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.hpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.hpp @@ -493,7 +493,7 @@ public: vk::VkSamplerAddressMode addressV = vk::VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT, vk::VkSamplerAddressMode addressW = vk::VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT, float mipLodBias = 0.0f, - vk::VkBool32 anisotropyEnable = vk::VK_FALSE, + vk::VkBool32 anisotropyEnable = VK_FALSE, float maxAnisotropy = 1.0f, vk::VkBool32 compareEnable = false, vk::VkCompareOp compareOp = vk::VK_COMPARE_OP_ALWAYS, diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp index 22315d5..ed83f84 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp @@ -331,8 +331,8 @@ void Image::readUsingBuffer (vk::VkQueue queue, barrier.dstAccessMask = 0; barrier.oldLayout = vk::VK_IMAGE_LAYOUT_UNDEFINED; barrier.newLayout = vk::VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = object(); barrier.subresourceRange.aspectMask = aspect; @@ -617,8 +617,8 @@ void Image::upload (vk::VkQueue queue, barrier.dstAccessMask = 0; barrier.oldLayout = vk::VK_IMAGE_LAYOUT_UNDEFINED; barrier.newLayout = vk::VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = object(); barrier.subresourceRange.aspectMask = aspect; @@ -738,8 +738,8 @@ void Image::uploadUsingBuffer (vk::VkQueue queue, barrier.dstAccessMask = 0; barrier.oldLayout = vk::VK_IMAGE_LAYOUT_UNDEFINED; barrier.newLayout = vk::VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = object(); barrier.subresourceRange.aspectMask = aspect; @@ -889,8 +889,8 @@ void transition2DImage (const vk::DeviceInterface& vk, barrier.dstAccessMask = 0; barrier.oldLayout = oldLayout; barrier.newLayout = newLayout; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = image; barrier.subresourceRange.aspectMask = aspectMask; barrier.subresourceRange.baseMipLevel = 0; diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp index ad0fbe4..9e15d25 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp @@ -74,7 +74,7 @@ protected: struct FirtsInstanceSupported { static deUint32 getFirstInstance (void) { return 2; } - static bool isTestSupported (const vk::VkPhysicalDeviceFeatures& features) { return features.drawIndirectFirstInstance == vk::VK_TRUE; } + static bool isTestSupported (const vk::VkPhysicalDeviceFeatures& features) { return features.drawIndirectFirstInstance == VK_TRUE; } }; struct FirtsInstanceNotSupported diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCBTests.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCBTests.cpp index 99f0176..b38d7b8 100644 --- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCBTests.cpp +++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCBTests.cpp @@ -62,7 +62,7 @@ public: const vk::Unique fs (createShaderModule(m_vk, device, m_context.getBinaryCollection().get(m_fragmentShaderName), 0)); const vk::VkPipelineColorBlendAttachmentState VkPipelineColorBlendAttachmentState = - PipelineCreateInfo::ColorBlendState::Attachment(vk::VK_TRUE, + PipelineCreateInfo::ColorBlendState::Attachment(VK_TRUE, vk::VK_BLEND_FACTOR_SRC_ALPHA, vk::VK_BLEND_FACTOR_CONSTANT_COLOR, vk::VK_BLEND_OP_ADD, vk::VK_BLEND_FACTOR_SRC_ALPHA, vk::VK_BLEND_FACTOR_CONSTANT_ALPHA, vk::VK_BLEND_OP_ADD); diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCreateInfoUtil.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCreateInfoUtil.cpp index 94d8433..dde691a 100644 --- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCreateInfoUtil.cpp +++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCreateInfoUtil.cpp @@ -446,7 +446,7 @@ AttachmentReference::AttachmentReference (deUint32 _attachment, vk::VkImageLayou AttachmentReference::AttachmentReference (void) { - attachment = vk::VK_ATTACHMENT_UNUSED; + attachment = VK_ATTACHMENT_UNUSED; layout = vk::VK_IMAGE_LAYOUT_UNDEFINED; } diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCreateInfoUtil.hpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCreateInfoUtil.hpp index 02adf9a..0427de2 100644 --- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCreateInfoUtil.hpp +++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCreateInfoUtil.hpp @@ -495,7 +495,7 @@ public: vk::VkSamplerAddressMode addressV = vk::VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT, vk::VkSamplerAddressMode addressW = vk::VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT, float mipLodBias = 0.0f, - vk::VkBool32 anisotropyEnable = vk::VK_FALSE, + vk::VkBool32 anisotropyEnable = VK_FALSE, float maxAnisotropy = 1.0f, vk::VkBool32 compareEnable = false, vk::VkCompareOp compareOp = vk::VK_COMPARE_OP_ALWAYS, diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp index 5fe145d..984c662 100644 --- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp +++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp @@ -434,11 +434,11 @@ public: m_data.push_back(PositionColorVertex(tcu::Vec4(1.0f, -1.0f, 1.0f, 1.0f), tcu::RGBA::blue().toVec())); m_depthStencilState_1 = PipelineCreateInfo::DepthStencilState( - vk::VK_TRUE, vk::VK_TRUE, vk::VK_COMPARE_OP_ALWAYS, vk::VK_FALSE); + VK_TRUE, VK_TRUE, vk::VK_COMPARE_OP_ALWAYS, VK_FALSE); // enable depth bounds test m_depthStencilState_2 = PipelineCreateInfo::DepthStencilState( - vk::VK_FALSE, vk::VK_FALSE, vk::VK_COMPARE_OP_NEVER, vk::VK_TRUE); + VK_FALSE, VK_FALSE, vk::VK_COMPARE_OP_NEVER, VK_TRUE); DepthStencilBaseCase::initialize(); } @@ -587,10 +587,10 @@ public: // enable stencil test m_depthStencilState_1 = PipelineCreateInfo::DepthStencilState( - vk::VK_FALSE, vk::VK_FALSE, vk::VK_COMPARE_OP_NEVER, vk::VK_FALSE, vk::VK_TRUE, frontState_1, backState_1); + VK_FALSE, VK_FALSE, vk::VK_COMPARE_OP_NEVER, VK_FALSE, VK_TRUE, frontState_1, backState_1); m_depthStencilState_2 = PipelineCreateInfo::DepthStencilState( - vk::VK_FALSE, vk::VK_FALSE, vk::VK_COMPARE_OP_NEVER, vk::VK_FALSE, vk::VK_TRUE, frontState_2, backState_2); + VK_FALSE, VK_FALSE, vk::VK_COMPARE_OP_NEVER, VK_FALSE, VK_TRUE, frontState_2, backState_2); DepthStencilBaseCase::initialize(); } @@ -757,10 +757,10 @@ public: // enable stencil test m_depthStencilState_1 = PipelineCreateInfo::DepthStencilState( - vk::VK_FALSE, vk::VK_FALSE, vk::VK_COMPARE_OP_NEVER, vk::VK_FALSE, vk::VK_TRUE, frontState_1, backState_1); + VK_FALSE, VK_FALSE, vk::VK_COMPARE_OP_NEVER, VK_FALSE, VK_TRUE, frontState_1, backState_1); m_depthStencilState_2 = PipelineCreateInfo::DepthStencilState( - vk::VK_FALSE, vk::VK_FALSE, vk::VK_COMPARE_OP_NEVER, vk::VK_FALSE, vk::VK_TRUE, frontState_2, backState_2); + VK_FALSE, VK_FALSE, vk::VK_COMPARE_OP_NEVER, VK_FALSE, VK_TRUE, frontState_2, backState_2); DepthStencilBaseCase::initialize(); } diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateImageObjectUtil.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateImageObjectUtil.cpp index e00b5b1..f4d6cbf 100644 --- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateImageObjectUtil.cpp +++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateImageObjectUtil.cpp @@ -331,8 +331,8 @@ void Image::readUsingBuffer (vk::VkQueue queue, barrier.dstAccessMask = 0; barrier.oldLayout = vk::VK_IMAGE_LAYOUT_UNDEFINED; barrier.newLayout = vk::VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = object(); barrier.subresourceRange.aspectMask = aspect; @@ -617,8 +617,8 @@ void Image::upload (vk::VkQueue queue, barrier.dstAccessMask = 0; barrier.oldLayout = vk::VK_IMAGE_LAYOUT_UNDEFINED; barrier.newLayout = vk::VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = object(); barrier.subresourceRange.aspectMask = aspect; @@ -738,8 +738,8 @@ void Image::uploadUsingBuffer (vk::VkQueue queue, barrier.dstAccessMask = 0; barrier.oldLayout = vk::VK_IMAGE_LAYOUT_UNDEFINED; barrier.newLayout = vk::VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = object(); barrier.subresourceRange.aspectMask = aspect; @@ -891,8 +891,8 @@ void transition2DImage (const vk::DeviceInterface& vk, barrier.dstAccessMask = dstAccessMask; barrier.oldLayout = oldLayout; barrier.newLayout = newLayout; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = image; barrier.subresourceRange.aspectMask = aspectMask; barrier.subresourceRange.baseMipLevel = 0; diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp index 016d715..370b338 100644 --- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp +++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp @@ -398,7 +398,7 @@ public: // enable depth test m_depthStencilState = PipelineCreateInfo::DepthStencilState( - vk::VK_TRUE, vk::VK_TRUE, vk::VK_COMPARE_OP_GREATER_OR_EQUAL); + VK_TRUE, VK_TRUE, vk::VK_COMPARE_OP_GREATER_OR_EQUAL); DepthBiasBaseCase::initialize(); } @@ -505,7 +505,7 @@ public: m_data.push_back(PositionColorVertex(tcu::Vec4(0.5f, -0.5f, 0.01f, 1.0f), tcu::RGBA::green().toVec())); // enable depth test - m_depthStencilState = PipelineCreateInfo::DepthStencilState(vk::VK_TRUE, vk::VK_TRUE, vk::VK_COMPARE_OP_GREATER_OR_EQUAL); + m_depthStencilState = PipelineCreateInfo::DepthStencilState(VK_TRUE, VK_TRUE, vk::VK_COMPARE_OP_GREATER_OR_EQUAL); DepthBiasBaseCase::initialize(); } diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp index 4f3c823..f1a381d 100644 --- a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp +++ b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp @@ -499,7 +499,7 @@ vk::Move createBeginCommandBuffer (const vk::DeviceInterfac 0, 0, 0, - vk::VK_FALSE, + VK_FALSE, 0u, 0u }; @@ -2025,12 +2025,12 @@ void PipelineBarrier::submit (SubmitContext& context) m_srcAccesses, m_dstAccesses, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, context.getBuffer(), 0, - vk::VK_WHOLE_SIZE + VK_WHOLE_SIZE }; vkd.cmdPipelineBarrier(cmd, m_srcStages, m_dstStages, (vk::VkDependencyFlags)0, 0, (const vk::VkMemoryBarrier*)DE_NULL, 1, &barrier, 0, (const vk::VkImageMemoryBarrier*)DE_NULL); @@ -2050,8 +2050,8 @@ void PipelineBarrier::submit (SubmitContext& context) *m_imageLayout, *m_imageLayout, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, context.getImage(), { @@ -2150,8 +2150,8 @@ void ImageTransition::submit (SubmitContext& context) m_srcLayout, m_dstLayout, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, context.getImage(), { @@ -2351,11 +2351,11 @@ void BufferCopyToBuffer::verify (VerifyContext& context, size_t commandIndex) vk::VK_ACCESS_TRANSFER_WRITE_BIT, vk::VK_ACCESS_HOST_READ_BIT, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_dstBuffer, 0, - vk::VK_WHOLE_SIZE + VK_WHOLE_SIZE }; vkd.cmdPipelineBarrier(*commandBuffer, vk::VK_PIPELINE_STAGE_TRANSFER_BIT, vk::VK_PIPELINE_STAGE_HOST_BIT, (vk::VkDependencyFlags)0, 0, (const vk::VkMemoryBarrier*)DE_NULL, 1, &barrier, 0, (const vk::VkImageMemoryBarrier*)DE_NULL); @@ -2562,8 +2562,8 @@ void BufferCopyToImage::prepare (PrepareContext& context) vk::VK_IMAGE_LAYOUT_UNDEFINED, vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_dstImage, { @@ -2638,8 +2638,8 @@ void BufferCopyToImage::verify (VerifyContext& context, size_t commandIndex) vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_dstImage, { @@ -2658,11 +2658,11 @@ void BufferCopyToImage::verify (VerifyContext& context, size_t commandIndex) vk::VK_ACCESS_TRANSFER_WRITE_BIT, vk::VK_ACCESS_HOST_READ_BIT, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *dstBuffer, 0, - vk::VK_WHOLE_SIZE + VK_WHOLE_SIZE }; const vk::VkBufferImageCopy region = @@ -2809,8 +2809,8 @@ void BufferCopyFromImage::prepare (PrepareContext& context) vk::VK_IMAGE_LAYOUT_UNDEFINED, vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_srcImage, { @@ -2832,8 +2832,8 @@ void BufferCopyFromImage::prepare (PrepareContext& context) vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_srcImage, { @@ -3016,11 +3016,11 @@ void ImageCopyToBuffer::verify (VerifyContext& context, size_t commandIndex) vk::VK_ACCESS_TRANSFER_WRITE_BIT, vk::VK_ACCESS_HOST_READ_BIT, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_dstBuffer, 0, - vk::VK_WHOLE_SIZE + VK_WHOLE_SIZE }; vkd.cmdPipelineBarrier(*commandBuffer, vk::VK_PIPELINE_STAGE_TRANSFER_BIT, vk::VK_PIPELINE_STAGE_HOST_BIT, (vk::VkDependencyFlags)0, 0, (const vk::VkMemoryBarrier*)DE_NULL, 1, &barrier, 0, (const vk::VkImageMemoryBarrier*)DE_NULL); @@ -3244,8 +3244,8 @@ void ImageCopyFromImage::prepare (PrepareContext& context) vk::VK_IMAGE_LAYOUT_UNDEFINED, vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_srcImage, { @@ -3267,8 +3267,8 @@ void ImageCopyFromImage::prepare (PrepareContext& context) vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_srcImage, { @@ -3465,8 +3465,8 @@ void ImageCopyToImage::prepare (PrepareContext& context) vk::VK_IMAGE_LAYOUT_UNDEFINED, vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_dstImage, { @@ -3546,8 +3546,8 @@ void ImageCopyToImage::verify (VerifyContext& context, size_t commandIndex) vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_dstImage, { @@ -3566,11 +3566,11 @@ void ImageCopyToImage::verify (VerifyContext& context, size_t commandIndex) vk::VK_ACCESS_TRANSFER_WRITE_BIT, vk::VK_ACCESS_HOST_READ_BIT, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *dstBuffer, 0, - vk::VK_WHOLE_SIZE + VK_WHOLE_SIZE }; const vk::VkBufferImageCopy region = { @@ -3726,8 +3726,8 @@ void ImageBlitFromImage::prepare (PrepareContext& context) vk::VK_IMAGE_LAYOUT_UNDEFINED, vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_srcImage, { @@ -3749,8 +3749,8 @@ void ImageBlitFromImage::prepare (PrepareContext& context) vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_srcImage, { @@ -3999,8 +3999,8 @@ void ImageBlitToImage::prepare (PrepareContext& context) vk::VK_IMAGE_LAYOUT_UNDEFINED, vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_dstImage, { @@ -4090,8 +4090,8 @@ void ImageBlitToImage::verify (VerifyContext& context, size_t commandIndex) vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_dstImage, { @@ -4110,11 +4110,11 @@ void ImageBlitToImage::verify (VerifyContext& context, size_t commandIndex) vk::VK_ACCESS_TRANSFER_WRITE_BIT, vk::VK_ACCESS_HOST_READ_BIT, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *dstBuffer, 0, - vk::VK_WHOLE_SIZE + VK_WHOLE_SIZE }; const vk::VkBufferImageCopy region = { @@ -4552,8 +4552,8 @@ void SubmitRenderPass::verify (VerifyContext& context, size_t commandIndex) vk::VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *m_colorTarget, { @@ -4572,11 +4572,11 @@ void SubmitRenderPass::verify (VerifyContext& context, size_t commandIndex) vk::VK_ACCESS_TRANSFER_WRITE_BIT, vk::VK_ACCESS_HOST_READ_BIT, - vk::VK_QUEUE_FAMILY_IGNORED, - vk::VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, + VK_QUEUE_FAMILY_IGNORED, *dstBuffer, 0, - vk::VK_WHOLE_SIZE + VK_WHOLE_SIZE }; const vk::VkBufferImageCopy region = { @@ -4788,7 +4788,7 @@ void RenderBuffer::prepare (PrepareRenderPassContext& context) DE_NULL, 0, vk::VK_PRIMITIVE_TOPOLOGY_POINT_LIST, - vk::VK_FALSE + VK_FALSE }; const vk::VkViewport viewports[] = { @@ -4814,12 +4814,12 @@ void RenderBuffer::prepare (PrepareRenderPassContext& context) DE_NULL, 0, - vk::VK_TRUE, - vk::VK_FALSE, + VK_TRUE, + VK_FALSE, vk::VK_POLYGON_MODE_FILL, vk::VK_CULL_MODE_NONE, vk::VK_FRONT_FACE_COUNTER_CLOCKWISE, - vk::VK_FALSE, + VK_FALSE, 0.0f, 0.0f, 0.0f, @@ -4833,16 +4833,16 @@ void RenderBuffer::prepare (PrepareRenderPassContext& context) 0, vk::VK_SAMPLE_COUNT_1_BIT, - vk::VK_FALSE, + VK_FALSE, 0.0f, &sampleMask, - vk::VK_FALSE, - vk::VK_FALSE + VK_FALSE, + VK_FALSE }; const vk::VkPipelineColorBlendAttachmentState attachments[] = { { - vk::VK_FALSE, + VK_FALSE, vk::VK_BLEND_FACTOR_ONE, vk::VK_BLEND_FACTOR_ZERO, vk::VK_BLEND_OP_ADD, @@ -4861,7 +4861,7 @@ void RenderBuffer::prepare (PrepareRenderPassContext& context) DE_NULL, 0, - vk::VK_FALSE, + VK_FALSE, vk::VK_LOGIC_OP_COPY, DE_LENGTH_OF_ARRAY(attachments), attachments, diff --git a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolCreateInfoUtil.cpp b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolCreateInfoUtil.cpp index 26fef97..1e2ea23 100644 --- a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolCreateInfoUtil.cpp +++ b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolCreateInfoUtil.cpp @@ -449,7 +449,7 @@ AttachmentReference::AttachmentReference (deUint32 _attachment, vk::VkImageLayou AttachmentReference::AttachmentReference (void) { - attachment = vk::VK_ATTACHMENT_UNUSED; + attachment = VK_ATTACHMENT_UNUSED; layout = vk::VK_IMAGE_LAYOUT_UNDEFINED; } diff --git a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolCreateInfoUtil.hpp b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolCreateInfoUtil.hpp index 811f2b3..8b314a5 100644 --- a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolCreateInfoUtil.hpp +++ b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolCreateInfoUtil.hpp @@ -493,7 +493,7 @@ public: vk::VkSamplerAddressMode addressV = vk::VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT, vk::VkSamplerAddressMode addressW = vk::VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT, float mipLodBias = 0.0f, - vk::VkBool32 anisotropyEnable = vk::VK_FALSE, + vk::VkBool32 anisotropyEnable = VK_FALSE, float maxAnisotropy = 1.0f, vk::VkBool32 compareEnable = false, vk::VkCompareOp compareOp = vk::VK_COMPARE_OP_ALWAYS, diff --git a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolImageObjectUtil.cpp b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolImageObjectUtil.cpp index 4b15ecf..c1960b8 100644 --- a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolImageObjectUtil.cpp +++ b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolImageObjectUtil.cpp @@ -308,8 +308,8 @@ void Image::readUsingBuffer (vk::VkQueue queue, barrier.dstAccessMask = 0; barrier.oldLayout = vk::VK_IMAGE_LAYOUT_UNDEFINED; barrier.newLayout = vk::VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = object(); barrier.subresourceRange.aspectMask = aspect; @@ -594,8 +594,8 @@ void Image::upload (vk::VkQueue queue, barrier.dstAccessMask = 0; barrier.oldLayout = vk::VK_IMAGE_LAYOUT_UNDEFINED; barrier.newLayout = vk::VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = object(); barrier.subresourceRange.aspectMask = aspect; @@ -715,8 +715,8 @@ void Image::uploadUsingBuffer (vk::VkQueue queue, barrier.dstAccessMask = 0; barrier.oldLayout = vk::VK_IMAGE_LAYOUT_UNDEFINED; barrier.newLayout = vk::VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = object(); barrier.subresourceRange.aspectMask = aspect; @@ -870,8 +870,8 @@ void transition2DImage (const vk::DeviceInterface& vk, barrier.dstAccessMask = dstAccessMask; barrier.oldLayout = oldLayout; barrier.newLayout = newLayout; - barrier.srcQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = vk::VK_QUEUE_FAMILY_IGNORED; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = image; barrier.subresourceRange.aspectMask = aspectMask; barrier.subresourceRange.baseMipLevel = 0; diff --git a/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp b/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp index 37a5b59..83e964f 100644 --- a/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp +++ b/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp @@ -861,7 +861,7 @@ Move createRenderPass (Context& context, vk::VkFormat colorAtt }; const vk::VkAttachmentReference dsAttRef = { - vk::VK_NO_ATTACHMENT, // attachment + VK_ATTACHMENT_UNUSED, // attachment vk::VK_IMAGE_LAYOUT_GENERAL, // layout }; const vk::VkSubpassDescription subpassDesc = @@ -1058,11 +1058,11 @@ Move createPipeline (Context& context, vk::VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, // sType DE_NULL, // pNext (vk::VkPipelineDepthStencilStateCreateFlags)0, - vk::VK_FALSE, // depthTestEnable - vk::VK_FALSE, // depthWriteEnable + VK_FALSE, // depthTestEnable + VK_FALSE, // depthWriteEnable vk::VK_COMPARE_OP_ALWAYS, // depthCompareOp - vk::VK_FALSE, // depthBoundsTestEnable - vk::VK_FALSE, // stencilTestEnable + VK_FALSE, // depthBoundsTestEnable + VK_FALSE, // stencilTestEnable { vk::VK_STENCIL_OP_KEEP, // stencilFailOp; vk::VK_STENCIL_OP_KEEP, // stencilPassOp; @@ -1117,8 +1117,8 @@ Move createPipeline (Context& context, DE_FALSE, // sampleShadingEnable 0.0f, // minSampleShading DE_NULL, // pSampleMask - vk::VK_FALSE, // alphaToCoverageEnable - vk::VK_FALSE, // alphaToOneEnable + VK_FALSE, // alphaToCoverageEnable + VK_FALSE, // alphaToOneEnable }; const vk::VkPipelineRasterizationStateCreateInfo rasterParams = { @@ -1130,7 +1130,7 @@ Move createPipeline (Context& context, vk::VK_POLYGON_MODE_FILL, // fillMode vk::VK_CULL_MODE_NONE, // cullMode; vk::VK_FRONT_FACE_COUNTER_CLOCKWISE, // frontFace; - vk::VK_FALSE, // depthBiasEnable + VK_FALSE, // depthBiasEnable 0.0f, // depthBiasConstantFactor 0.0f, // depthBiasClamp 0.0f, // depthBiasSlopeFactor @@ -1173,7 +1173,7 @@ Move createPipeline (Context& context, | vk::VK_COLOR_COMPONENT_A_BIT; const vk::VkPipelineColorBlendAttachmentState attBlendParams = { - vk::VK_FALSE, // blendEnable + VK_FALSE, // blendEnable vk::VK_BLEND_FACTOR_ONE, // srcBlendColor vk::VK_BLEND_FACTOR_ZERO, // destBlendColor vk::VK_BLEND_OP_ADD, // blendOpColor @@ -1187,7 +1187,7 @@ Move createPipeline (Context& context, vk::VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO, // sType DE_NULL, // pNext (vk::VkPipelineColorBlendStateCreateFlags)0, - vk::VK_FALSE, // logicOpEnable + VK_FALSE, // logicOpEnable vk::VK_LOGIC_OP_COPY, // logicOp 1u, // attachmentCount &attBlendParams, // pAttachments diff --git a/external/vulkancts/modules/vulkan/vktSynchronization.cpp b/external/vulkancts/modules/vulkan/vktSynchronization.cpp index 75994e5..153c8f1 100644 --- a/external/vulkancts/modules/vulkan/vktSynchronization.cpp +++ b/external/vulkancts/modules/vulkan/vktSynchronization.cpp @@ -322,7 +322,7 @@ void createColorOnlyRenderPass (const DeviceInterface& vkd, VkDevice device, co colorAttachmentRef.attachment = 0; colorAttachmentRef.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - stencilAttachmentRef.attachment = VK_NO_ATTACHMENT; + stencilAttachmentRef.attachment = VK_ATTACHMENT_UNUSED; stencilAttachmentRef.layout = VK_IMAGE_LAYOUT_UNDEFINED; subpassDesc.flags = 0; diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp index 66db6e6..a450128 100644 --- a/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp +++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp @@ -416,9 +416,9 @@ void validateSurfaceFormats (tcu::ResultCollector& results, Type wsiType, const { static const VkSurfaceFormatKHR s_androidFormats[] = { - { VK_FORMAT_R8G8B8A8_UNORM, VK_COLORSPACE_SRGB_NONLINEAR_KHR }, - { VK_FORMAT_R8G8B8A8_SRGB, VK_COLORSPACE_SRGB_NONLINEAR_KHR }, - { VK_FORMAT_R5G6B5_UNORM_PACK16, VK_COLORSPACE_SRGB_NONLINEAR_KHR } + { VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR }, + { VK_FORMAT_R8G8B8A8_SRGB, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR }, + { VK_FORMAT_R5G6B5_UNORM_PACK16, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR } }; requiredFormats = &s_androidFormats[0]; -- 2.7.4