X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=external%2Fvulkancts%2Fframework%2Fvulkan%2FvkTypeUtil.inl;h=22a7632856ae820717df2599902de5146cb6f504;hb=2f442619367e349e42f041ca094bbdc6b9699bca;hp=cf4e2c12eaf8a757259fd09c5c4223dd07d81eb1;hpb=6e45d74d72f7453ac2cbe2d9b291989ea182ad0c;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/external/vulkancts/framework/vulkan/vkTypeUtil.inl b/external/vulkancts/framework/vulkan/vkTypeUtil.inl
index cf4e2c1..22a7632 100644
--- a/external/vulkancts/framework/vulkan/vkTypeUtil.inl
+++ b/external/vulkancts/framework/vulkan/vkTypeUtil.inl
@@ -384,76 +384,48 @@ inline VkDisplayPlanePropertiesKHR makeDisplayPlanePropertiesKHR (VkDisplayKHR c
 	return res;
 }
 
-inline VkIndirectCommandsTokenNVX makeIndirectCommandsTokenNVX (VkIndirectCommandsTokenTypeNVX tokenType, VkBuffer buffer, VkDeviceSize offset)
+inline VkPresentRegionKHR makePresentRegionKHR (deUint32 rectangleCount, const VkRectLayerKHR* pRectangles)
 {
-	VkIndirectCommandsTokenNVX res;
-	res.tokenType	= tokenType;
-	res.buffer		= buffer;
-	res.offset		= offset;
-	return res;
-}
-
-inline VkIndirectCommandsLayoutTokenNVX makeIndirectCommandsLayoutTokenNVX (VkIndirectCommandsTokenTypeNVX tokenType, deUint32 bindingUnit, deUint32 dynamicCount, deUint32 divisor)
-{
-	VkIndirectCommandsLayoutTokenNVX res;
-	res.tokenType		= tokenType;
-	res.bindingUnit		= bindingUnit;
-	res.dynamicCount	= dynamicCount;
-	res.divisor			= divisor;
+	VkPresentRegionKHR res;
+	res.rectangleCount	= rectangleCount;
+	res.pRectangles		= pRectangles;
 	return res;
 }
 
-inline VkObjectTableEntryNVX makeObjectTableEntryNVX (VkObjectEntryTypeNVX type, VkObjectEntryUsageFlagsNVX flags)
+inline VkDescriptorUpdateTemplateEntryKHR makeDescriptorUpdateTemplateEntryKHR (deUint32 dstBinding, deUint32 dstArrayElement, deUint32 descriptorCount, VkDescriptorType descriptorType, deUintptr offset, deUintptr stride)
 {
-	VkObjectTableEntryNVX res;
-	res.type	= type;
-	res.flags	= flags;
-	return res;
-}
-
-inline VkObjectTablePipelineEntryNVX makeObjectTablePipelineEntryNVX (VkObjectEntryTypeNVX type, VkObjectEntryUsageFlagsNVX flags, VkPipeline pipeline)
-{
-	VkObjectTablePipelineEntryNVX res;
-	res.type		= type;
-	res.flags		= flags;
-	res.pipeline	= pipeline;
-	return res;
-}
-
-inline VkObjectTableDescriptorSetEntryNVX makeObjectTableDescriptorSetEntryNVX (VkObjectEntryTypeNVX type, VkObjectEntryUsageFlagsNVX flags, VkPipelineLayout pipelineLayout, VkDescriptorSet descriptorSet)
-{
-	VkObjectTableDescriptorSetEntryNVX res;
-	res.type			= type;
-	res.flags			= flags;
-	res.pipelineLayout	= pipelineLayout;
-	res.descriptorSet	= descriptorSet;
+	VkDescriptorUpdateTemplateEntryKHR res;
+	res.dstBinding		= dstBinding;
+	res.dstArrayElement	= dstArrayElement;
+	res.descriptorCount	= descriptorCount;
+	res.descriptorType	= descriptorType;
+	res.offset			= offset;
+	res.stride			= stride;
 	return res;
 }
 
-inline VkObjectTableVertexBufferEntryNVX makeObjectTableVertexBufferEntryNVX (VkObjectEntryTypeNVX type, VkObjectEntryUsageFlagsNVX flags, VkBuffer buffer)
+inline VkRefreshCycleDurationGOOGLE makeRefreshCycleDurationGOOGLE (deUint64 refreshDuration)
 {
-	VkObjectTableVertexBufferEntryNVX res;
-	res.type	= type;
-	res.flags	= flags;
-	res.buffer	= buffer;
+	VkRefreshCycleDurationGOOGLE res;
+	res.refreshDuration	= refreshDuration;
 	return res;
 }
 
-inline VkObjectTableIndexBufferEntryNVX makeObjectTableIndexBufferEntryNVX (VkObjectEntryTypeNVX type, VkObjectEntryUsageFlagsNVX flags, VkBuffer buffer)
+inline VkPastPresentationTimingGOOGLE makePastPresentationTimingGOOGLE (deUint32 presentID, deUint64 desiredPresentTime, deUint64 actualPresentTime, deUint64 earliestPresentTime, deUint64 presentMargin)
 {
-	VkObjectTableIndexBufferEntryNVX res;
-	res.type	= type;
-	res.flags	= flags;
-	res.buffer	= buffer;
+	VkPastPresentationTimingGOOGLE res;
+	res.presentID			= presentID;
+	res.desiredPresentTime	= desiredPresentTime;
+	res.actualPresentTime	= actualPresentTime;
+	res.earliestPresentTime	= earliestPresentTime;
+	res.presentMargin		= presentMargin;
 	return res;
 }
 
-inline VkObjectTablePushConstantEntryNVX makeObjectTablePushConstantEntryNVX (VkObjectEntryTypeNVX type, VkObjectEntryUsageFlagsNVX flags, VkPipelineLayout pipelineLayout, VkShaderStageFlags stageFlags)
+inline VkPresentTimeGOOGLE makePresentTimeGOOGLE (deUint32 presentID, deUint64 desiredPresentTime)
 {
-	VkObjectTablePushConstantEntryNVX res;
-	res.type			= type;
-	res.flags			= flags;
-	res.pipelineLayout	= pipelineLayout;
-	res.stageFlags		= stageFlags;
+	VkPresentTimeGOOGLE res;
+	res.presentID			= presentID;
+	res.desiredPresentTime	= desiredPresentTime;
 	return res;
 }