vulkan: beautification changes
TODO: verify vk-layer-generate.py
TODO: need to rename object tracker generator
v2: fix "python3 vulkan.py"
fix dead cod in tri introduced by rebase
beautify wsi_null.c (olv)
diff --git a/include/vkLayer.h b/include/vkLayer.h
index c3679a0..f5b6fac 100644
--- a/include/vkLayer.h
+++ b/include/vkLayer.h
@@ -20,141 +20,141 @@
typedef struct _VK_BASE_LAYER_OBJECT
{
- vkGetProcAddrType pGPA;
- VK_BASE_OBJECT nextObject;
- VK_BASE_OBJECT baseObject;
+ PFN_vkGetProcAddr pGPA;
+ VkBaseObject nextObject;
+ VkBaseObject baseObject;
} VK_BASE_LAYER_OBJECT;
typedef struct _VK_LAYER_DISPATCH_TABLE
{
- vkGetProcAddrType GetProcAddr;
- vkCreateInstanceType CreateInstance;
- vkDestroyInstanceType DestroyInstance;
- vkEnumerateGpusType EnumerateGpus;
- vkGetGpuInfoType GetGpuInfo;
- vkCreateDeviceType CreateDevice;
- vkDestroyDeviceType DestroyDevice;
- vkGetExtensionSupportType GetExtensionSupport;
- vkEnumerateLayersType EnumerateLayers;
- vkGetDeviceQueueType GetDeviceQueue;
- vkQueueSubmitType QueueSubmit;
- vkQueueAddMemReferenceType QueueAddMemReference;
- vkQueueRemoveMemReferenceType QueueRemoveMemReference;
- vkQueueWaitIdleType QueueWaitIdle;
- vkDeviceWaitIdleType DeviceWaitIdle;
- vkAllocMemoryType AllocMemory;
- vkFreeMemoryType FreeMemory;
- vkSetMemoryPriorityType SetMemoryPriority;
- vkMapMemoryType MapMemory;
- vkUnmapMemoryType UnmapMemory;
- vkPinSystemMemoryType PinSystemMemory;
- vkGetMultiGpuCompatibilityType GetMultiGpuCompatibility;
- vkOpenSharedMemoryType OpenSharedMemory;
- vkOpenSharedSemaphoreType OpenSharedSemaphore;
- vkOpenPeerMemoryType OpenPeerMemory;
- vkOpenPeerImageType OpenPeerImage;
- vkDestroyObjectType DestroyObject;
- vkGetObjectInfoType GetObjectInfo;
- vkBindObjectMemoryType BindObjectMemory;
- vkBindObjectMemoryRangeType BindObjectMemoryRange;
- vkBindImageMemoryRangeType BindImageMemoryRange;
- vkCreateFenceType CreateFence;
- vkGetFenceStatusType GetFenceStatus;
- vkResetFencesType ResetFences;
- vkWaitForFencesType WaitForFences;
- vkCreateSemaphoreType CreateSemaphore;
- vkQueueSignalSemaphoreType QueueSignalSemaphore;
- vkQueueWaitSemaphoreType QueueWaitSemaphore;
- vkCreateEventType CreateEvent;
- vkGetEventStatusType GetEventStatus;
- vkSetEventType SetEvent;
- vkResetEventType ResetEvent;
- vkCreateQueryPoolType CreateQueryPool;
- vkGetQueryPoolResultsType GetQueryPoolResults;
- vkGetFormatInfoType GetFormatInfo;
- vkCreateBufferType CreateBuffer;
- vkCreateBufferViewType CreateBufferView;
- vkCreateImageType CreateImage;
- vkGetImageSubresourceInfoType GetImageSubresourceInfo;
- vkCreateImageViewType CreateImageView;
- vkCreateColorAttachmentViewType CreateColorAttachmentView;
- vkCreateDepthStencilViewType CreateDepthStencilView;
- vkCreateShaderType CreateShader;
- vkCreateGraphicsPipelineType CreateGraphicsPipeline;
- vkCreateGraphicsPipelineDerivativeType CreateGraphicsPipelineDerivative;
- vkCreateComputePipelineType CreateComputePipeline;
- vkStorePipelineType StorePipeline;
- vkLoadPipelineType LoadPipeline;
- vkLoadPipelineDerivativeType LoadPipelineDerivative;
- vkCreateSamplerType CreateSampler;
- vkCreateDescriptorSetLayoutType CreateDescriptorSetLayout;
- vkCreateDescriptorSetLayoutChainType CreateDescriptorSetLayoutChain;
- vkBeginDescriptorPoolUpdateType BeginDescriptorPoolUpdate;
- vkEndDescriptorPoolUpdateType EndDescriptorPoolUpdate;
- vkCreateDescriptorPoolType CreateDescriptorPool;
- vkResetDescriptorPoolType ResetDescriptorPool;
- vkAllocDescriptorSetsType AllocDescriptorSets;
- vkClearDescriptorSetsType ClearDescriptorSets;
- vkUpdateDescriptorsType UpdateDescriptors;
- vkCreateDynamicViewportStateType CreateDynamicViewportState;
- vkCreateDynamicRasterStateType CreateDynamicRasterState;
- vkCreateDynamicColorBlendStateType CreateDynamicColorBlendState;
- vkCreateDynamicDepthStencilStateType CreateDynamicDepthStencilState;
- vkCreateCommandBufferType CreateCommandBuffer;
- vkBeginCommandBufferType BeginCommandBuffer;
- vkEndCommandBufferType EndCommandBuffer;
- vkResetCommandBufferType ResetCommandBuffer;
- vkCmdBindPipelineType CmdBindPipeline;
- vkCmdBindDynamicStateObjectType CmdBindDynamicStateObject;
- vkCmdBindDescriptorSetsType CmdBindDescriptorSets;
- vkCmdBindVertexBufferType CmdBindVertexBuffer;
- vkCmdBindIndexBufferType CmdBindIndexBuffer;
- vkCmdDrawType CmdDraw;
- vkCmdDrawIndexedType CmdDrawIndexed;
- vkCmdDrawIndirectType CmdDrawIndirect;
- vkCmdDrawIndexedIndirectType CmdDrawIndexedIndirect;
- vkCmdDispatchType CmdDispatch;
- vkCmdDispatchIndirectType CmdDispatchIndirect;
- vkCmdCopyBufferType CmdCopyBuffer;
- vkCmdCopyImageType CmdCopyImage;
- vkCmdBlitImageType CmdBlitImage;
- vkCmdCopyBufferToImageType CmdCopyBufferToImage;
- vkCmdCopyImageToBufferType CmdCopyImageToBuffer;
- vkCmdCloneImageDataType CmdCloneImageData;
- vkCmdUpdateBufferType CmdUpdateBuffer;
- vkCmdFillBufferType CmdFillBuffer;
- vkCmdClearColorImageType CmdClearColorImage;
- vkCmdClearDepthStencilType CmdClearDepthStencil;
- vkCmdResolveImageType CmdResolveImage;
- vkCmdSetEventType CmdSetEvent;
- vkCmdResetEventType CmdResetEvent;
- vkCmdWaitEventsType CmdWaitEvents;
- vkCmdPipelineBarrierType CmdPipelineBarrier;
- vkCmdBeginQueryType CmdBeginQuery;
- vkCmdEndQueryType CmdEndQuery;
- vkCmdResetQueryPoolType CmdResetQueryPool;
- vkCmdWriteTimestampType CmdWriteTimestamp;
- vkCmdInitAtomicCountersType CmdInitAtomicCounters;
- vkCmdLoadAtomicCountersType CmdLoadAtomicCounters;
- vkCmdSaveAtomicCountersType CmdSaveAtomicCounters;
- vkCreateFramebufferType CreateFramebuffer;
- vkCreateRenderPassType CreateRenderPass;
- vkCmdBeginRenderPassType CmdBeginRenderPass;
- vkCmdEndRenderPassType CmdEndRenderPass;
- vkDbgSetValidationLevelType DbgSetValidationLevel;
- vkDbgRegisterMsgCallbackType DbgRegisterMsgCallback;
- vkDbgUnregisterMsgCallbackType DbgUnregisterMsgCallback;
- vkDbgSetMessageFilterType DbgSetMessageFilter;
- vkDbgSetObjectTagType DbgSetObjectTag;
- vkDbgSetGlobalOptionType DbgSetGlobalOption;
- vkDbgSetDeviceOptionType DbgSetDeviceOption;
- vkCmdDbgMarkerBeginType CmdDbgMarkerBegin;
- vkCmdDbgMarkerEndType CmdDbgMarkerEnd;
+ PFN_vkGetProcAddr GetProcAddr;
+ PFN_vkCreateInstance CreateInstance;
+ PFN_vkDestroyInstance DestroyInstance;
+ PFN_vkEnumerateGpus EnumerateGpus;
+ PFN_vkGetGpuInfo GetGpuInfo;
+ PFN_vkCreateDevice CreateDevice;
+ PFN_vkDestroyDevice DestroyDevice;
+ PFN_vkGetExtensionSupport GetExtensionSupport;
+ PFN_vkEnumerateLayers EnumerateLayers;
+ PFN_vkGetDeviceQueue GetDeviceQueue;
+ PFN_vkQueueSubmit QueueSubmit;
+ PFN_vkQueueAddMemReference QueueAddMemReference;
+ PFN_vkQueueRemoveMemReference QueueRemoveMemReference;
+ PFN_vkQueueWaitIdle QueueWaitIdle;
+ PFN_vkDeviceWaitIdle DeviceWaitIdle;
+ PFN_vkAllocMemory AllocMemory;
+ PFN_vkFreeMemory FreeMemory;
+ PFN_vkSetMemoryPriority SetMemoryPriority;
+ PFN_vkMapMemory MapMemory;
+ PFN_vkUnmapMemory UnmapMemory;
+ PFN_vkPinSystemMemory PinSystemMemory;
+ PFN_vkGetMultiGpuCompatibility GetMultiGpuCompatibility;
+ PFN_vkOpenSharedMemory OpenSharedMemory;
+ PFN_vkOpenSharedSemaphore OpenSharedSemaphore;
+ PFN_vkOpenPeerMemory OpenPeerMemory;
+ PFN_vkOpenPeerImage OpenPeerImage;
+ PFN_vkDestroyObject DestroyObject;
+ PFN_vkGetObjectInfo GetObjectInfo;
+ PFN_vkBindObjectMemory BindObjectMemory;
+ PFN_vkBindObjectMemoryRange BindObjectMemoryRange;
+ PFN_vkBindImageMemoryRange BindImageMemoryRange;
+ PFN_vkCreateFence CreateFence;
+ PFN_vkGetFenceStatus GetFenceStatus;
+ PFN_vkResetFences ResetFences;
+ PFN_vkWaitForFences WaitForFences;
+ PFN_vkCreateSemaphore CreateSemaphore;
+ PFN_vkQueueSignalSemaphore QueueSignalSemaphore;
+ PFN_vkQueueWaitSemaphore QueueWaitSemaphore;
+ PFN_vkCreateEvent CreateEvent;
+ PFN_vkGetEventStatus GetEventStatus;
+ PFN_vkSetEvent SetEvent;
+ PFN_vkResetEvent ResetEvent;
+ PFN_vkCreateQueryPool CreateQueryPool;
+ PFN_vkGetQueryPoolResults GetQueryPoolResults;
+ PFN_vkGetFormatInfo GetFormatInfo;
+ PFN_vkCreateBuffer CreateBuffer;
+ PFN_vkCreateBufferView CreateBufferView;
+ PFN_vkCreateImage CreateImage;
+ PFN_vkGetImageSubresourceInfo GetImageSubresourceInfo;
+ PFN_vkCreateImageView CreateImageView;
+ PFN_vkCreateColorAttachmentView CreateColorAttachmentView;
+ PFN_vkCreateDepthStencilView CreateDepthStencilView;
+ PFN_vkCreateShader CreateShader;
+ PFN_vkCreateGraphicsPipeline CreateGraphicsPipeline;
+ PFN_vkCreateGraphicsPipelineDerivative CreateGraphicsPipelineDerivative;
+ PFN_vkCreateComputePipeline CreateComputePipeline;
+ PFN_vkStorePipeline StorePipeline;
+ PFN_vkLoadPipeline LoadPipeline;
+ PFN_vkLoadPipelineDerivative LoadPipelineDerivative;
+ PFN_vkCreateSampler CreateSampler;
+ PFN_vkCreateDescriptorSetLayout CreateDescriptorSetLayout;
+ PFN_vkCreateDescriptorSetLayoutChain CreateDescriptorSetLayoutChain;
+ PFN_vkBeginDescriptorPoolUpdate BeginDescriptorPoolUpdate;
+ PFN_vkEndDescriptorPoolUpdate EndDescriptorPoolUpdate;
+ PFN_vkCreateDescriptorPool CreateDescriptorPool;
+ PFN_vkResetDescriptorPool ResetDescriptorPool;
+ PFN_vkAllocDescriptorSets AllocDescriptorSets;
+ PFN_vkClearDescriptorSets ClearDescriptorSets;
+ PFN_vkUpdateDescriptors UpdateDescriptors;
+ PFN_vkCreateDynamicViewportState CreateDynamicViewportState;
+ PFN_vkCreateDynamicRasterState CreateDynamicRasterState;
+ PFN_vkCreateDynamicColorBlendState CreateDynamicColorBlendState;
+ PFN_vkCreateDynamicDepthStencilState CreateDynamicDepthStencilState;
+ PFN_vkCreateCommandBuffer CreateCommandBuffer;
+ PFN_vkBeginCommandBuffer BeginCommandBuffer;
+ PFN_vkEndCommandBuffer EndCommandBuffer;
+ PFN_vkResetCommandBuffer ResetCommandBuffer;
+ PFN_vkCmdBindPipeline CmdBindPipeline;
+ PFN_vkCmdBindDynamicStateObject CmdBindDynamicStateObject;
+ PFN_vkCmdBindDescriptorSets CmdBindDescriptorSets;
+ PFN_vkCmdBindVertexBuffer CmdBindVertexBuffer;
+ PFN_vkCmdBindIndexBuffer CmdBindIndexBuffer;
+ PFN_vkCmdDraw CmdDraw;
+ PFN_vkCmdDrawIndexed CmdDrawIndexed;
+ PFN_vkCmdDrawIndirect CmdDrawIndirect;
+ PFN_vkCmdDrawIndexedIndirect CmdDrawIndexedIndirect;
+ PFN_vkCmdDispatch CmdDispatch;
+ PFN_vkCmdDispatchIndirect CmdDispatchIndirect;
+ PFN_vkCmdCopyBuffer CmdCopyBuffer;
+ PFN_vkCmdCopyImage CmdCopyImage;
+ PFN_vkCmdBlitImage CmdBlitImage;
+ PFN_vkCmdCopyBufferToImage CmdCopyBufferToImage;
+ PFN_vkCmdCopyImageToBuffer CmdCopyImageToBuffer;
+ PFN_vkCmdCloneImageData CmdCloneImageData;
+ PFN_vkCmdUpdateBuffer CmdUpdateBuffer;
+ PFN_vkCmdFillBuffer CmdFillBuffer;
+ PFN_vkCmdClearColorImage CmdClearColorImage;
+ PFN_vkCmdClearDepthStencil CmdClearDepthStencil;
+ PFN_vkCmdResolveImage CmdResolveImage;
+ PFN_vkCmdSetEvent CmdSetEvent;
+ PFN_vkCmdResetEvent CmdResetEvent;
+ PFN_vkCmdWaitEvents CmdWaitEvents;
+ PFN_vkCmdPipelineBarrier CmdPipelineBarrier;
+ PFN_vkCmdBeginQuery CmdBeginQuery;
+ PFN_vkCmdEndQuery CmdEndQuery;
+ PFN_vkCmdResetQueryPool CmdResetQueryPool;
+ PFN_vkCmdWriteTimestamp CmdWriteTimestamp;
+ PFN_vkCmdInitAtomicCounters CmdInitAtomicCounters;
+ PFN_vkCmdLoadAtomicCounters CmdLoadAtomicCounters;
+ PFN_vkCmdSaveAtomicCounters CmdSaveAtomicCounters;
+ PFN_vkCreateFramebuffer CreateFramebuffer;
+ PFN_vkCreateRenderPass CreateRenderPass;
+ PFN_vkCmdBeginRenderPass CmdBeginRenderPass;
+ PFN_vkCmdEndRenderPass CmdEndRenderPass;
+ PFN_vkDbgSetValidationLevel DbgSetValidationLevel;
+ PFN_vkDbgRegisterMsgCallback DbgRegisterMsgCallback;
+ PFN_vkDbgUnregisterMsgCallback DbgUnregisterMsgCallback;
+ PFN_vkDbgSetMessageFilter DbgSetMessageFilter;
+ PFN_vkDbgSetObjectTag DbgSetObjectTag;
+ PFN_vkDbgSetGlobalOption DbgSetGlobalOption;
+ PFN_vkDbgSetDeviceOption DbgSetDeviceOption;
+ PFN_vkCmdDbgMarkerBegin CmdDbgMarkerBegin;
+ PFN_vkCmdDbgMarkerEnd CmdDbgMarkerEnd;
#if defined(__linux__) || defined(XCB_NVIDIA)
- vkWsiX11AssociateConnectionType WsiX11AssociateConnection;
- vkWsiX11GetMSCType WsiX11GetMSC;
- vkWsiX11CreatePresentableImageType WsiX11CreatePresentableImage;
- vkWsiX11QueuePresentType WsiX11QueuePresent;
+ PFN_vkWsiX11AssociateConnection WsiX11AssociateConnection;
+ PFN_vkWsiX11GetMSC WsiX11GetMSC;
+ PFN_vkWsiX11CreatePresentableImage WsiX11CreatePresentableImage;
+ PFN_vkWsiX11QueuePresent WsiX11QueuePresent;
#endif // WIN32
} VK_LAYER_DISPATCH_TABLE;