X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=external%2Fvulkancts%2Fframework%2Fvulkan%2FvkStructTypes.inl;h=059ada975548848eaf77015f7c71c3db0996de2e;hb=6cbd34be72b2b732fe4f8d60c850d52fb16f68bc;hp=75b183c989b7a5553f788803cc6f267e02bdd7a3;hpb=c50fb7696d48651ca58fa395e9f2d73c72e4a8fa;p=platform%2Fupstream%2FVK-GL-CTS.git diff --git a/external/vulkancts/framework/vulkan/vkStructTypes.inl b/external/vulkancts/framework/vulkan/vkStructTypes.inl index 75b183c..059ada9 100644 --- a/external/vulkancts/framework/vulkan/vkStructTypes.inl +++ b/external/vulkancts/framework/vulkan/vkStructTypes.inl @@ -18,9 +18,9 @@ struct VkInstanceCreateInfo const void* pNext; VkInstanceCreateFlags flags; const VkApplicationInfo* pApplicationInfo; - deUint32 enabledLayerNameCount; + deUint32 enabledLayerCount; const char* const* ppEnabledLayerNames; - deUint32 enabledExtensionNameCount; + deUint32 enabledExtensionCount; const char* const* ppEnabledExtensionNames; }; @@ -46,6 +46,7 @@ struct VkPhysicalDeviceFeatures VkBool32 dualSrcBlend; VkBool32 logicOp; VkBool32 multiDrawIndirect; + VkBool32 drawIndirectFirstInstance; VkBool32 depthClamp; VkBool32 depthBiasClamp; VkBool32 fillModeNonSolid; @@ -89,6 +90,7 @@ struct VkPhysicalDeviceFeatures VkBool32 sparseResidency16Samples; VkBool32 sparseResidencyAliased; VkBool32 variableMultisampleRate; + VkBool32 inheritedQueries; }; struct VkFormatProperties @@ -100,9 +102,9 @@ struct VkFormatProperties struct VkExtent3D { - deInt32 width; - deInt32 height; - deInt32 depth; + deUint32 width; + deUint32 height; + deUint32 depth; }; struct VkImageFormatProperties @@ -207,6 +209,7 @@ struct VkPhysicalDeviceLimits VkSampleCountFlags sampledImageStencilSampleCounts; VkSampleCountFlags storageImageSampleCounts; deUint32 maxSampleMaskWords; + VkBool32 timestampComputeAndGraphics; float timestampPeriod; deUint32 maxClipDistances; deUint32 maxCullDistances; @@ -290,9 +293,9 @@ struct VkDeviceCreateInfo VkDeviceCreateFlags flags; deUint32 queueCreateInfoCount; const VkDeviceQueueCreateInfo* pQueueCreateInfos; - deUint32 enabledLayerNameCount; + deUint32 enabledLayerCount; const char* const* ppEnabledLayerNames; - deUint32 enabledExtensionNameCount; + deUint32 enabledExtensionCount; const char* const* ppEnabledExtensionNames; const VkPhysicalDeviceFeatures* pEnabledFeatures; }; @@ -313,14 +316,15 @@ struct VkLayerProperties struct VkSubmitInfo { - VkStructureType sType; - const void* pNext; - deUint32 waitSemaphoreCount; - const VkSemaphore* pWaitSemaphores; - deUint32 commandBufferCount; - const VkCommandBuffer* pCommandBuffers; - deUint32 signalSemaphoreCount; - const VkSemaphore* pSignalSemaphores; + VkStructureType sType; + const void* pNext; + deUint32 waitSemaphoreCount; + const VkSemaphore* pWaitSemaphores; + const VkPipelineStageFlags* pWaitDstStageMask; + deUint32 commandBufferCount; + const VkCommandBuffer* pCommandBuffers; + deUint32 signalSemaphoreCount; + const VkSemaphore* pSignalSemaphores; }; struct VkMemoryAllocateInfo @@ -357,7 +361,7 @@ struct VkSparseImageFormatProperties struct VkSparseImageMemoryRequirements { VkSparseImageFormatProperties formatProperties; - deUint32 imageMipTailStartLod; + deUint32 imageMipTailFirstLod; VkDeviceSize imageMipTailSize; VkDeviceSize imageMipTailOffset; VkDeviceSize imageMipTailStride; @@ -460,7 +464,7 @@ struct VkQueryPoolCreateInfo const void* pNext; VkQueryPoolCreateFlags flags; VkQueryType queryType; - deUint32 entryCount; + deUint32 queryCount; VkQueryPipelineStatisticFlags pipelineStatistics; }; @@ -511,6 +515,7 @@ struct VkSubresourceLayout VkDeviceSize offset; VkDeviceSize size; VkDeviceSize rowPitch; + VkDeviceSize arrayPitch; VkDeviceSize depthPitch; }; @@ -626,7 +631,7 @@ struct VkPipelineTessellationStateCreateInfo { VkStructureType sType; const void* pNext; - VkPipelineTesselationStateCreateFlags flags; + VkPipelineTessellationStateCreateFlags flags; deUint32 patchControlPoints; }; @@ -648,8 +653,8 @@ struct VkOffset2D struct VkExtent2D { - deInt32 width; - deInt32 height; + deUint32 width; + deUint32 height; }; struct VkRect2D @@ -823,6 +828,7 @@ struct VkSamplerCreateInfo VkSamplerAddressMode addressModeV; VkSamplerAddressMode addressModeW; float mipLodBias; + VkBool32 anisotropyEnable; float maxAnisotropy; VkBool32 compareEnable; VkCompareOp compareOp; @@ -847,7 +853,7 @@ struct VkDescriptorSetLayoutCreateInfo const void* pNext; VkDescriptorSetLayoutCreateFlags flags; deUint32 bindingCount; - const VkDescriptorSetLayoutBinding* pBinding; + const VkDescriptorSetLayoutBinding* pBindings; }; struct VkDescriptorPoolSize @@ -871,7 +877,7 @@ struct VkDescriptorSetAllocateInfo VkStructureType sType; const void* pNext; VkDescriptorPool descriptorPool; - deUint32 setLayoutCount; + deUint32 descriptorSetCount; const VkDescriptorSetLayout* pSetLayouts; }; @@ -959,7 +965,7 @@ struct VkSubpassDescription const VkAttachmentReference* pResolveAttachments; const VkAttachmentReference* pDepthStencilAttachment; deUint32 preserveAttachmentCount; - const VkAttachmentReference* pPreserveAttachments; + const deUint32* pPreserveAttachments; }; struct VkSubpassDependency @@ -1000,14 +1006,13 @@ struct VkCommandBufferAllocateInfo const void* pNext; VkCommandPool commandPool; VkCommandBufferLevel level; - deUint32 bufferCount; + deUint32 commandBufferCount; }; -struct VkCommandBufferBeginInfo +struct VkCommandBufferInheritanceInfo { VkStructureType sType; const void* pNext; - VkCommandBufferUsageFlags flags; VkRenderPass renderPass; deUint32 subpass; VkFramebuffer framebuffer; @@ -1016,6 +1021,14 @@ struct VkCommandBufferBeginInfo VkQueryPipelineStatisticFlags pipelineStatistics; }; +struct VkCommandBufferBeginInfo +{ + VkStructureType sType; + const void* pNext; + VkCommandBufferUsageFlags flags; + const VkCommandBufferInheritanceInfo* pInheritanceInfo; +}; + struct VkBufferCopy { VkDeviceSize srcOffset; @@ -1043,11 +1056,9 @@ struct VkImageCopy struct VkImageBlit { VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffset; - VkExtent3D srcExtent; + VkOffset3D srcOffsets[2]; VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffset; - VkExtent3D dstExtent; + VkOffset3D dstOffsets[2]; }; struct VkBufferImageCopy @@ -1102,15 +1113,12 @@ struct VkImageResolve VkExtent3D extent; }; -struct VkRenderPassBeginInfo +struct VkMemoryBarrier { - VkStructureType sType; - const void* pNext; - VkRenderPass renderPass; - VkFramebuffer framebuffer; - VkRect2D renderArea; - deUint32 clearValueCount; - const VkClearValue* pClearValues; + VkStructureType sType; + const void* pNext; + VkAccessFlags srcAccessMask; + VkAccessFlags dstAccessMask; }; struct VkBufferMemoryBarrier @@ -1126,6 +1134,31 @@ struct VkBufferMemoryBarrier VkDeviceSize size; }; +struct VkImageMemoryBarrier +{ + VkStructureType sType; + const void* pNext; + VkAccessFlags srcAccessMask; + VkAccessFlags dstAccessMask; + VkImageLayout oldLayout; + VkImageLayout newLayout; + deUint32 srcQueueFamilyIndex; + deUint32 dstQueueFamilyIndex; + VkImage image; + VkImageSubresourceRange subresourceRange; +}; + +struct VkRenderPassBeginInfo +{ + VkStructureType sType; + const void* pNext; + VkRenderPass renderPass; + VkFramebuffer framebuffer; + VkRect2D renderArea; + deUint32 clearValueCount; + const VkClearValue* pClearValues; +}; + struct VkDispatchIndirectCommand { deUint32 x; @@ -1150,28 +1183,6 @@ struct VkDrawIndirectCommand deUint32 firstInstance; }; -struct VkImageMemoryBarrier -{ - VkStructureType sType; - const void* pNext; - VkAccessFlags srcAccessMask; - VkAccessFlags dstAccessMask; - VkImageLayout oldLayout; - VkImageLayout newLayout; - deUint32 srcQueueFamilyIndex; - deUint32 dstQueueFamilyIndex; - VkImage image; - VkImageSubresourceRange subresourceRange; -}; - -struct VkMemoryBarrier -{ - VkStructureType sType; - const void* pNext; - VkAccessFlags srcAccessMask; - VkAccessFlags dstAccessMask; -}; - struct VkSurfaceCapabilitiesKHR { deUint32 minImageCount; @@ -1299,3 +1310,100 @@ struct VkDisplayPresentInfoKHR VkBool32 persistent; }; +struct VkXlibSurfaceCreateInfoKHR +{ + VkStructureType sType; + const void* pNext; + VkXlibSurfaceCreateFlagsKHR flags; + pt::XlibDisplayPtr dpy; + pt::XlibWindow window; +}; + +struct VkXcbSurfaceCreateInfoKHR +{ + VkStructureType sType; + const void* pNext; + VkXcbSurfaceCreateFlagsKHR flags; + pt::XcbConnectionPtr connection; + pt::XcbWindow window; +}; + +struct VkWaylandSurfaceCreateInfoKHR +{ + VkStructureType sType; + const void* pNext; + VkWaylandSurfaceCreateFlagsKHR flags; + pt::WaylandDisplayPtr display; + pt::WaylandSurfacePtr surface; +}; + +struct VkMirSurfaceCreateInfoKHR +{ + VkStructureType sType; + const void* pNext; + VkMirSurfaceCreateFlagsKHR flags; + pt::MirConnectionPtr connection; + pt::MirSurfacePtr mirSurface; +}; + +struct VkAndroidSurfaceCreateInfoKHR +{ + VkStructureType sType; + const void* pNext; + VkAndroidSurfaceCreateFlagsKHR flags; + pt::AndroidNativeWindowPtr window; +}; + +struct VkWin32SurfaceCreateInfoKHR +{ + VkStructureType sType; + const void* pNext; + VkWin32SurfaceCreateFlagsKHR flags; + pt::Win32InstanceHandle hinstance; + pt::Win32WindowHandle hwnd; +}; + +struct VkDebugReportCallbackCreateInfoEXT +{ + VkStructureType sType; + const void* pNext; + VkDebugReportFlagsEXT flags; + PFN_vkDebugReportCallbackEXT pfnCallback; + 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]; +}; +