Stage 1 of rename
TODO: re-enable glave build, advance API for glave
v2: get rid of outdated code in tri introduced by rebase
rename wsi_null.c (olv)
diff --git a/xgl.py b/xgl.py
old mode 100644
new mode 100755
index 3a2d728..861d4fe
--- a/xgl.py
+++ b/xgl.py
@@ -1,4 +1,4 @@
-"""XGL API description"""
+"""VK API description"""
# Copyright (C) 2014 LunarG, Inc.
#
@@ -99,7 +99,7 @@
return "%s %s%s(%s)" % format_vals
def c_pretty_decl(self, name, attr=""):
- """Return a named declaration in C, with xgl.h formatting."""
+ """Return a named declaration in C, with vulkan.h formatting."""
plist = []
for param in self.params:
idx = param.ty.find("[")
@@ -131,11 +131,11 @@
return "%s(%s)" % (self.name, self.c_params(need_type=False))
def object_in_params(self):
- """Return the params that are simple XGL objects and are inputs."""
+ """Return the params that are simple VK objects and are inputs."""
return [param for param in self.params if param.ty in objects]
def object_out_params(self):
- """Return the params that are simple XGL objects and are outputs."""
+ """Return the params that are simple VK objects and are outputs."""
return [param for param in self.params
if param.dereferenced_type() in objects]
@@ -178,465 +178,465 @@
return "\n".join(lines)
-# XGL core API
+# VK core API
core = Extension(
- name="XGL_CORE",
- headers=["xgl.h", "xglDbg.h"],
+ name="VK_CORE",
+ headers=["vulkan.h", "xglDbg.h"],
objects=[
- "XGL_INSTANCE",
- "XGL_PHYSICAL_GPU",
- "XGL_BASE_OBJECT",
- "XGL_DEVICE",
- "XGL_QUEUE",
- "XGL_GPU_MEMORY",
- "XGL_OBJECT",
- "XGL_BUFFER",
- "XGL_BUFFER_VIEW",
- "XGL_IMAGE",
- "XGL_IMAGE_VIEW",
- "XGL_COLOR_ATTACHMENT_VIEW",
- "XGL_DEPTH_STENCIL_VIEW",
- "XGL_SHADER",
- "XGL_PIPELINE",
- "XGL_SAMPLER",
- "XGL_DESCRIPTOR_SET",
- "XGL_DESCRIPTOR_SET_LAYOUT",
- "XGL_DESCRIPTOR_SET_LAYOUT_CHAIN",
- "XGL_DESCRIPTOR_POOL",
- "XGL_DYNAMIC_STATE_OBJECT",
- "XGL_DYNAMIC_VP_STATE_OBJECT",
- "XGL_DYNAMIC_RS_STATE_OBJECT",
- "XGL_DYNAMIC_CB_STATE_OBJECT",
- "XGL_DYNAMIC_DS_STATE_OBJECT",
- "XGL_CMD_BUFFER",
- "XGL_FENCE",
- "XGL_SEMAPHORE",
- "XGL_EVENT",
- "XGL_QUERY_POOL",
- "XGL_FRAMEBUFFER",
- "XGL_RENDER_PASS",
+ "VK_INSTANCE",
+ "VK_PHYSICAL_GPU",
+ "VK_BASE_OBJECT",
+ "VK_DEVICE",
+ "VK_QUEUE",
+ "VK_GPU_MEMORY",
+ "VK_OBJECT",
+ "VK_BUFFER",
+ "VK_BUFFER_VIEW",
+ "VK_IMAGE",
+ "VK_IMAGE_VIEW",
+ "VK_COLOR_ATTACHMENT_VIEW",
+ "VK_DEPTH_STENCIL_VIEW",
+ "VK_SHADER",
+ "VK_PIPELINE",
+ "VK_SAMPLER",
+ "VK_DESCRIPTOR_SET",
+ "VK_DESCRIPTOR_SET_LAYOUT",
+ "VK_DESCRIPTOR_SET_LAYOUT_CHAIN",
+ "VK_DESCRIPTOR_POOL",
+ "VK_DYNAMIC_STATE_OBJECT",
+ "VK_DYNAMIC_VP_STATE_OBJECT",
+ "VK_DYNAMIC_RS_STATE_OBJECT",
+ "VK_DYNAMIC_CB_STATE_OBJECT",
+ "VK_DYNAMIC_DS_STATE_OBJECT",
+ "VK_CMD_BUFFER",
+ "VK_FENCE",
+ "VK_SEMAPHORE",
+ "VK_EVENT",
+ "VK_QUERY_POOL",
+ "VK_FRAMEBUFFER",
+ "VK_RENDER_PASS",
],
protos=[
- Proto("XGL_RESULT", "CreateInstance",
- [Param("const XGL_INSTANCE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_INSTANCE*", "pInstance")]),
+ Proto("VK_RESULT", "CreateInstance",
+ [Param("const VK_INSTANCE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_INSTANCE*", "pInstance")]),
- Proto("XGL_RESULT", "DestroyInstance",
- [Param("XGL_INSTANCE", "instance")]),
+ Proto("VK_RESULT", "DestroyInstance",
+ [Param("VK_INSTANCE", "instance")]),
- Proto("XGL_RESULT", "EnumerateGpus",
- [Param("XGL_INSTANCE", "instance"),
+ Proto("VK_RESULT", "EnumerateGpus",
+ [Param("VK_INSTANCE", "instance"),
Param("uint32_t", "maxGpus"),
Param("uint32_t*", "pGpuCount"),
- Param("XGL_PHYSICAL_GPU*", "pGpus")]),
+ Param("VK_PHYSICAL_GPU*", "pGpus")]),
- Proto("XGL_RESULT", "GetGpuInfo",
- [Param("XGL_PHYSICAL_GPU", "gpu"),
- Param("XGL_PHYSICAL_GPU_INFO_TYPE", "infoType"),
+ Proto("VK_RESULT", "GetGpuInfo",
+ [Param("VK_PHYSICAL_GPU", "gpu"),
+ Param("VK_PHYSICAL_GPU_INFO_TYPE", "infoType"),
Param("size_t*", "pDataSize"),
Param("void*", "pData")]),
Proto("void*", "GetProcAddr",
- [Param("XGL_PHYSICAL_GPU", "gpu"),
+ [Param("VK_PHYSICAL_GPU", "gpu"),
Param("const char*", "pName")]),
- Proto("XGL_RESULT", "CreateDevice",
- [Param("XGL_PHYSICAL_GPU", "gpu"),
- Param("const XGL_DEVICE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_DEVICE*", "pDevice")]),
+ Proto("VK_RESULT", "CreateDevice",
+ [Param("VK_PHYSICAL_GPU", "gpu"),
+ Param("const VK_DEVICE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_DEVICE*", "pDevice")]),
- Proto("XGL_RESULT", "DestroyDevice",
- [Param("XGL_DEVICE", "device")]),
+ Proto("VK_RESULT", "DestroyDevice",
+ [Param("VK_DEVICE", "device")]),
- Proto("XGL_RESULT", "GetExtensionSupport",
- [Param("XGL_PHYSICAL_GPU", "gpu"),
+ Proto("VK_RESULT", "GetExtensionSupport",
+ [Param("VK_PHYSICAL_GPU", "gpu"),
Param("const char*", "pExtName")]),
- Proto("XGL_RESULT", "EnumerateLayers",
- [Param("XGL_PHYSICAL_GPU", "gpu"),
+ Proto("VK_RESULT", "EnumerateLayers",
+ [Param("VK_PHYSICAL_GPU", "gpu"),
Param("size_t", "maxLayerCount"),
Param("size_t", "maxStringSize"),
Param("size_t*", "pOutLayerCount"),
Param("char* const*", "pOutLayers"),
Param("void*", "pReserved")]),
- Proto("XGL_RESULT", "GetDeviceQueue",
- [Param("XGL_DEVICE", "device"),
+ Proto("VK_RESULT", "GetDeviceQueue",
+ [Param("VK_DEVICE", "device"),
Param("uint32_t", "queueNodeIndex"),
Param("uint32_t", "queueIndex"),
- Param("XGL_QUEUE*", "pQueue")]),
+ Param("VK_QUEUE*", "pQueue")]),
- Proto("XGL_RESULT", "QueueSubmit",
- [Param("XGL_QUEUE", "queue"),
+ Proto("VK_RESULT", "QueueSubmit",
+ [Param("VK_QUEUE", "queue"),
Param("uint32_t", "cmdBufferCount"),
- Param("const XGL_CMD_BUFFER*", "pCmdBuffers"),
- Param("XGL_FENCE", "fence")]),
+ Param("const VK_CMD_BUFFER*", "pCmdBuffers"),
+ Param("VK_FENCE", "fence")]),
- Proto("XGL_RESULT", "QueueAddMemReference",
- [Param("XGL_QUEUE", "queue"),
- Param("XGL_GPU_MEMORY", "mem")]),
+ Proto("VK_RESULT", "QueueAddMemReference",
+ [Param("VK_QUEUE", "queue"),
+ Param("VK_GPU_MEMORY", "mem")]),
- Proto("XGL_RESULT", "QueueRemoveMemReference",
- [Param("XGL_QUEUE", "queue"),
- Param("XGL_GPU_MEMORY", "mem")]),
+ Proto("VK_RESULT", "QueueRemoveMemReference",
+ [Param("VK_QUEUE", "queue"),
+ Param("VK_GPU_MEMORY", "mem")]),
- Proto("XGL_RESULT", "QueueWaitIdle",
- [Param("XGL_QUEUE", "queue")]),
+ Proto("VK_RESULT", "QueueWaitIdle",
+ [Param("VK_QUEUE", "queue")]),
- Proto("XGL_RESULT", "DeviceWaitIdle",
- [Param("XGL_DEVICE", "device")]),
+ Proto("VK_RESULT", "DeviceWaitIdle",
+ [Param("VK_DEVICE", "device")]),
- Proto("XGL_RESULT", "AllocMemory",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_MEMORY_ALLOC_INFO*", "pAllocInfo"),
- Param("XGL_GPU_MEMORY*", "pMem")]),
+ Proto("VK_RESULT", "AllocMemory",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_MEMORY_ALLOC_INFO*", "pAllocInfo"),
+ Param("VK_GPU_MEMORY*", "pMem")]),
- Proto("XGL_RESULT", "FreeMemory",
- [Param("XGL_GPU_MEMORY", "mem")]),
+ Proto("VK_RESULT", "FreeMemory",
+ [Param("VK_GPU_MEMORY", "mem")]),
- Proto("XGL_RESULT", "SetMemoryPriority",
- [Param("XGL_GPU_MEMORY", "mem"),
- Param("XGL_MEMORY_PRIORITY", "priority")]),
+ Proto("VK_RESULT", "SetMemoryPriority",
+ [Param("VK_GPU_MEMORY", "mem"),
+ Param("VK_MEMORY_PRIORITY", "priority")]),
- Proto("XGL_RESULT", "MapMemory",
- [Param("XGL_GPU_MEMORY", "mem"),
- Param("XGL_FLAGS", "flags"),
+ Proto("VK_RESULT", "MapMemory",
+ [Param("VK_GPU_MEMORY", "mem"),
+ Param("VK_FLAGS", "flags"),
Param("void**", "ppData")]),
- Proto("XGL_RESULT", "UnmapMemory",
- [Param("XGL_GPU_MEMORY", "mem")]),
+ Proto("VK_RESULT", "UnmapMemory",
+ [Param("VK_GPU_MEMORY", "mem")]),
- Proto("XGL_RESULT", "PinSystemMemory",
- [Param("XGL_DEVICE", "device"),
+ Proto("VK_RESULT", "PinSystemMemory",
+ [Param("VK_DEVICE", "device"),
Param("const void*", "pSysMem"),
Param("size_t", "memSize"),
- Param("XGL_GPU_MEMORY*", "pMem")]),
+ Param("VK_GPU_MEMORY*", "pMem")]),
- Proto("XGL_RESULT", "GetMultiGpuCompatibility",
- [Param("XGL_PHYSICAL_GPU", "gpu0"),
- Param("XGL_PHYSICAL_GPU", "gpu1"),
- Param("XGL_GPU_COMPATIBILITY_INFO*", "pInfo")]),
+ Proto("VK_RESULT", "GetMultiGpuCompatibility",
+ [Param("VK_PHYSICAL_GPU", "gpu0"),
+ Param("VK_PHYSICAL_GPU", "gpu1"),
+ Param("VK_GPU_COMPATIBILITY_INFO*", "pInfo")]),
- Proto("XGL_RESULT", "OpenSharedMemory",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_MEMORY_OPEN_INFO*", "pOpenInfo"),
- Param("XGL_GPU_MEMORY*", "pMem")]),
+ Proto("VK_RESULT", "OpenSharedMemory",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_MEMORY_OPEN_INFO*", "pOpenInfo"),
+ Param("VK_GPU_MEMORY*", "pMem")]),
- Proto("XGL_RESULT", "OpenSharedSemaphore",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_SEMAPHORE_OPEN_INFO*", "pOpenInfo"),
- Param("XGL_SEMAPHORE*", "pSemaphore")]),
+ Proto("VK_RESULT", "OpenSharedSemaphore",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_SEMAPHORE_OPEN_INFO*", "pOpenInfo"),
+ Param("VK_SEMAPHORE*", "pSemaphore")]),
- Proto("XGL_RESULT", "OpenPeerMemory",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_PEER_MEMORY_OPEN_INFO*", "pOpenInfo"),
- Param("XGL_GPU_MEMORY*", "pMem")]),
+ Proto("VK_RESULT", "OpenPeerMemory",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_PEER_MEMORY_OPEN_INFO*", "pOpenInfo"),
+ Param("VK_GPU_MEMORY*", "pMem")]),
- Proto("XGL_RESULT", "OpenPeerImage",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_PEER_IMAGE_OPEN_INFO*", "pOpenInfo"),
- Param("XGL_IMAGE*", "pImage"),
- Param("XGL_GPU_MEMORY*", "pMem")]),
+ Proto("VK_RESULT", "OpenPeerImage",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_PEER_IMAGE_OPEN_INFO*", "pOpenInfo"),
+ Param("VK_IMAGE*", "pImage"),
+ Param("VK_GPU_MEMORY*", "pMem")]),
- Proto("XGL_RESULT", "DestroyObject",
- [Param("XGL_OBJECT", "object")]),
+ Proto("VK_RESULT", "DestroyObject",
+ [Param("VK_OBJECT", "object")]),
- Proto("XGL_RESULT", "GetObjectInfo",
- [Param("XGL_BASE_OBJECT", "object"),
- Param("XGL_OBJECT_INFO_TYPE", "infoType"),
+ Proto("VK_RESULT", "GetObjectInfo",
+ [Param("VK_BASE_OBJECT", "object"),
+ Param("VK_OBJECT_INFO_TYPE", "infoType"),
Param("size_t*", "pDataSize"),
Param("void*", "pData")]),
- Proto("XGL_RESULT", "BindObjectMemory",
- [Param("XGL_OBJECT", "object"),
+ Proto("VK_RESULT", "BindObjectMemory",
+ [Param("VK_OBJECT", "object"),
Param("uint32_t", "allocationIdx"),
- Param("XGL_GPU_MEMORY", "mem"),
- Param("XGL_GPU_SIZE", "offset")]),
+ Param("VK_GPU_MEMORY", "mem"),
+ Param("VK_GPU_SIZE", "offset")]),
- Proto("XGL_RESULT", "BindObjectMemoryRange",
- [Param("XGL_OBJECT", "object"),
+ Proto("VK_RESULT", "BindObjectMemoryRange",
+ [Param("VK_OBJECT", "object"),
Param("uint32_t", "allocationIdx"),
- Param("XGL_GPU_SIZE", "rangeOffset"),
- Param("XGL_GPU_SIZE", "rangeSize"),
- Param("XGL_GPU_MEMORY", "mem"),
- Param("XGL_GPU_SIZE", "memOffset")]),
+ Param("VK_GPU_SIZE", "rangeOffset"),
+ Param("VK_GPU_SIZE", "rangeSize"),
+ Param("VK_GPU_MEMORY", "mem"),
+ Param("VK_GPU_SIZE", "memOffset")]),
- Proto("XGL_RESULT", "BindImageMemoryRange",
- [Param("XGL_IMAGE", "image"),
+ Proto("VK_RESULT", "BindImageMemoryRange",
+ [Param("VK_IMAGE", "image"),
Param("uint32_t", "allocationIdx"),
- Param("const XGL_IMAGE_MEMORY_BIND_INFO*", "bindInfo"),
- Param("XGL_GPU_MEMORY", "mem"),
- Param("XGL_GPU_SIZE", "memOffset")]),
+ Param("const VK_IMAGE_MEMORY_BIND_INFO*", "bindInfo"),
+ Param("VK_GPU_MEMORY", "mem"),
+ Param("VK_GPU_SIZE", "memOffset")]),
- Proto("XGL_RESULT", "CreateFence",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_FENCE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_FENCE*", "pFence")]),
+ Proto("VK_RESULT", "CreateFence",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_FENCE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_FENCE*", "pFence")]),
- Proto("XGL_RESULT", "ResetFences",
- [Param("XGL_DEVICE", "device"),
+ Proto("VK_RESULT", "ResetFences",
+ [Param("VK_DEVICE", "device"),
Param("uint32_t", "fenceCount"),
- Param("XGL_FENCE*", "pFences")]),
+ Param("VK_FENCE*", "pFences")]),
- Proto("XGL_RESULT", "GetFenceStatus",
- [Param("XGL_FENCE", "fence")]),
+ Proto("VK_RESULT", "GetFenceStatus",
+ [Param("VK_FENCE", "fence")]),
- Proto("XGL_RESULT", "WaitForFences",
- [Param("XGL_DEVICE", "device"),
+ Proto("VK_RESULT", "WaitForFences",
+ [Param("VK_DEVICE", "device"),
Param("uint32_t", "fenceCount"),
- Param("const XGL_FENCE*", "pFences"),
+ Param("const VK_FENCE*", "pFences"),
Param("bool32_t", "waitAll"),
Param("uint64_t", "timeout")]),
- Proto("XGL_RESULT", "CreateSemaphore",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_SEMAPHORE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_SEMAPHORE*", "pSemaphore")]),
+ Proto("VK_RESULT", "CreateSemaphore",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_SEMAPHORE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_SEMAPHORE*", "pSemaphore")]),
- Proto("XGL_RESULT", "QueueSignalSemaphore",
- [Param("XGL_QUEUE", "queue"),
- Param("XGL_SEMAPHORE", "semaphore")]),
+ Proto("VK_RESULT", "QueueSignalSemaphore",
+ [Param("VK_QUEUE", "queue"),
+ Param("VK_SEMAPHORE", "semaphore")]),
- Proto("XGL_RESULT", "QueueWaitSemaphore",
- [Param("XGL_QUEUE", "queue"),
- Param("XGL_SEMAPHORE", "semaphore")]),
+ Proto("VK_RESULT", "QueueWaitSemaphore",
+ [Param("VK_QUEUE", "queue"),
+ Param("VK_SEMAPHORE", "semaphore")]),
- Proto("XGL_RESULT", "CreateEvent",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_EVENT_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_EVENT*", "pEvent")]),
+ Proto("VK_RESULT", "CreateEvent",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_EVENT_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_EVENT*", "pEvent")]),
- Proto("XGL_RESULT", "GetEventStatus",
- [Param("XGL_EVENT", "event")]),
+ Proto("VK_RESULT", "GetEventStatus",
+ [Param("VK_EVENT", "event")]),
- Proto("XGL_RESULT", "SetEvent",
- [Param("XGL_EVENT", "event")]),
+ Proto("VK_RESULT", "SetEvent",
+ [Param("VK_EVENT", "event")]),
- Proto("XGL_RESULT", "ResetEvent",
- [Param("XGL_EVENT", "event")]),
+ Proto("VK_RESULT", "ResetEvent",
+ [Param("VK_EVENT", "event")]),
- Proto("XGL_RESULT", "CreateQueryPool",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_QUERY_POOL_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_QUERY_POOL*", "pQueryPool")]),
+ Proto("VK_RESULT", "CreateQueryPool",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_QUERY_POOL_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_QUERY_POOL*", "pQueryPool")]),
- Proto("XGL_RESULT", "GetQueryPoolResults",
- [Param("XGL_QUERY_POOL", "queryPool"),
+ Proto("VK_RESULT", "GetQueryPoolResults",
+ [Param("VK_QUERY_POOL", "queryPool"),
Param("uint32_t", "startQuery"),
Param("uint32_t", "queryCount"),
Param("size_t*", "pDataSize"),
Param("void*", "pData")]),
- Proto("XGL_RESULT", "GetFormatInfo",
- [Param("XGL_DEVICE", "device"),
- Param("XGL_FORMAT", "format"),
- Param("XGL_FORMAT_INFO_TYPE", "infoType"),
+ Proto("VK_RESULT", "GetFormatInfo",
+ [Param("VK_DEVICE", "device"),
+ Param("VK_FORMAT", "format"),
+ Param("VK_FORMAT_INFO_TYPE", "infoType"),
Param("size_t*", "pDataSize"),
Param("void*", "pData")]),
- Proto("XGL_RESULT", "CreateBuffer",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_BUFFER_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_BUFFER*", "pBuffer")]),
+ Proto("VK_RESULT", "CreateBuffer",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_BUFFER_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_BUFFER*", "pBuffer")]),
- Proto("XGL_RESULT", "CreateBufferView",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_BUFFER_VIEW_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_BUFFER_VIEW*", "pView")]),
+ Proto("VK_RESULT", "CreateBufferView",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_BUFFER_VIEW_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_BUFFER_VIEW*", "pView")]),
- Proto("XGL_RESULT", "CreateImage",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_IMAGE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_IMAGE*", "pImage")]),
+ Proto("VK_RESULT", "CreateImage",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_IMAGE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_IMAGE*", "pImage")]),
- Proto("XGL_RESULT", "GetImageSubresourceInfo",
- [Param("XGL_IMAGE", "image"),
- Param("const XGL_IMAGE_SUBRESOURCE*", "pSubresource"),
- Param("XGL_SUBRESOURCE_INFO_TYPE", "infoType"),
+ Proto("VK_RESULT", "GetImageSubresourceInfo",
+ [Param("VK_IMAGE", "image"),
+ Param("const VK_IMAGE_SUBRESOURCE*", "pSubresource"),
+ Param("VK_SUBRESOURCE_INFO_TYPE", "infoType"),
Param("size_t*", "pDataSize"),
Param("void*", "pData")]),
- Proto("XGL_RESULT", "CreateImageView",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_IMAGE_VIEW_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_IMAGE_VIEW*", "pView")]),
+ Proto("VK_RESULT", "CreateImageView",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_IMAGE_VIEW_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_IMAGE_VIEW*", "pView")]),
- Proto("XGL_RESULT", "CreateColorAttachmentView",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_COLOR_ATTACHMENT_VIEW_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_COLOR_ATTACHMENT_VIEW*", "pView")]),
+ Proto("VK_RESULT", "CreateColorAttachmentView",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_COLOR_ATTACHMENT_VIEW_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_COLOR_ATTACHMENT_VIEW*", "pView")]),
- Proto("XGL_RESULT", "CreateDepthStencilView",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_DEPTH_STENCIL_VIEW_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_DEPTH_STENCIL_VIEW*", "pView")]),
+ Proto("VK_RESULT", "CreateDepthStencilView",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_DEPTH_STENCIL_VIEW_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_DEPTH_STENCIL_VIEW*", "pView")]),
- Proto("XGL_RESULT", "CreateShader",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_SHADER_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_SHADER*", "pShader")]),
+ Proto("VK_RESULT", "CreateShader",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_SHADER_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_SHADER*", "pShader")]),
- Proto("XGL_RESULT", "CreateGraphicsPipeline",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_GRAPHICS_PIPELINE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_PIPELINE*", "pPipeline")]),
+ Proto("VK_RESULT", "CreateGraphicsPipeline",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_GRAPHICS_PIPELINE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_PIPELINE*", "pPipeline")]),
- Proto("XGL_RESULT", "CreateGraphicsPipelineDerivative",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_GRAPHICS_PIPELINE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_PIPELINE", "basePipeline"),
- Param("XGL_PIPELINE*", "pPipeline")]),
+ Proto("VK_RESULT", "CreateGraphicsPipelineDerivative",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_GRAPHICS_PIPELINE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_PIPELINE", "basePipeline"),
+ Param("VK_PIPELINE*", "pPipeline")]),
- Proto("XGL_RESULT", "CreateComputePipeline",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_COMPUTE_PIPELINE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_PIPELINE*", "pPipeline")]),
+ Proto("VK_RESULT", "CreateComputePipeline",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_COMPUTE_PIPELINE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_PIPELINE*", "pPipeline")]),
- Proto("XGL_RESULT", "StorePipeline",
- [Param("XGL_PIPELINE", "pipeline"),
+ Proto("VK_RESULT", "StorePipeline",
+ [Param("VK_PIPELINE", "pipeline"),
Param("size_t*", "pDataSize"),
Param("void*", "pData")]),
- Proto("XGL_RESULT", "LoadPipeline",
- [Param("XGL_DEVICE", "device"),
+ Proto("VK_RESULT", "LoadPipeline",
+ [Param("VK_DEVICE", "device"),
Param("size_t", "dataSize"),
Param("const void*", "pData"),
- Param("XGL_PIPELINE*", "pPipeline")]),
+ Param("VK_PIPELINE*", "pPipeline")]),
- Proto("XGL_RESULT", "LoadPipelineDerivative",
- [Param("XGL_DEVICE", "device"),
+ Proto("VK_RESULT", "LoadPipelineDerivative",
+ [Param("VK_DEVICE", "device"),
Param("size_t", "dataSize"),
Param("const void*", "pData"),
- Param("XGL_PIPELINE", "basePipeline"),
- Param("XGL_PIPELINE*", "pPipeline")]),
+ Param("VK_PIPELINE", "basePipeline"),
+ Param("VK_PIPELINE*", "pPipeline")]),
- Proto("XGL_RESULT", "CreateSampler",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_SAMPLER_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_SAMPLER*", "pSampler")]),
+ Proto("VK_RESULT", "CreateSampler",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_SAMPLER_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_SAMPLER*", "pSampler")]),
- Proto("XGL_RESULT", "CreateDescriptorSetLayout",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_DESCRIPTOR_SET_LAYOUT*", "pSetLayout")]),
+ Proto("VK_RESULT", "CreateDescriptorSetLayout",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_DESCRIPTOR_SET_LAYOUT*", "pSetLayout")]),
- Proto("XGL_RESULT", "CreateDescriptorSetLayoutChain",
- [Param("XGL_DEVICE", "device"),
+ Proto("VK_RESULT", "CreateDescriptorSetLayoutChain",
+ [Param("VK_DEVICE", "device"),
Param("uint32_t", "setLayoutArrayCount"),
- Param("const XGL_DESCRIPTOR_SET_LAYOUT*", "pSetLayoutArray"),
- Param("XGL_DESCRIPTOR_SET_LAYOUT_CHAIN*", "pLayoutChain")]),
+ Param("const VK_DESCRIPTOR_SET_LAYOUT*", "pSetLayoutArray"),
+ Param("VK_DESCRIPTOR_SET_LAYOUT_CHAIN*", "pLayoutChain")]),
- Proto("XGL_RESULT", "BeginDescriptorPoolUpdate",
- [Param("XGL_DEVICE", "device"),
- Param("XGL_DESCRIPTOR_UPDATE_MODE", "updateMode")]),
+ Proto("VK_RESULT", "BeginDescriptorPoolUpdate",
+ [Param("VK_DEVICE", "device"),
+ Param("VK_DESCRIPTOR_UPDATE_MODE", "updateMode")]),
- Proto("XGL_RESULT", "EndDescriptorPoolUpdate",
- [Param("XGL_DEVICE", "device"),
- Param("XGL_CMD_BUFFER", "cmd")]),
+ Proto("VK_RESULT", "EndDescriptorPoolUpdate",
+ [Param("VK_DEVICE", "device"),
+ Param("VK_CMD_BUFFER", "cmd")]),
- Proto("XGL_RESULT", "CreateDescriptorPool",
- [Param("XGL_DEVICE", "device"),
- Param("XGL_DESCRIPTOR_POOL_USAGE", "poolUsage"),
+ Proto("VK_RESULT", "CreateDescriptorPool",
+ [Param("VK_DEVICE", "device"),
+ Param("VK_DESCRIPTOR_POOL_USAGE", "poolUsage"),
Param("uint32_t", "maxSets"),
- Param("const XGL_DESCRIPTOR_POOL_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_DESCRIPTOR_POOL*", "pDescriptorPool")]),
+ Param("const VK_DESCRIPTOR_POOL_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_DESCRIPTOR_POOL*", "pDescriptorPool")]),
- Proto("XGL_RESULT", "ResetDescriptorPool",
- [Param("XGL_DESCRIPTOR_POOL", "descriptorPool")]),
+ Proto("VK_RESULT", "ResetDescriptorPool",
+ [Param("VK_DESCRIPTOR_POOL", "descriptorPool")]),
- Proto("XGL_RESULT", "AllocDescriptorSets",
- [Param("XGL_DESCRIPTOR_POOL", "descriptorPool"),
- Param("XGL_DESCRIPTOR_SET_USAGE", "setUsage"),
+ Proto("VK_RESULT", "AllocDescriptorSets",
+ [Param("VK_DESCRIPTOR_POOL", "descriptorPool"),
+ Param("VK_DESCRIPTOR_SET_USAGE", "setUsage"),
Param("uint32_t", "count"),
- Param("const XGL_DESCRIPTOR_SET_LAYOUT*", "pSetLayouts"),
- Param("XGL_DESCRIPTOR_SET*", "pDescriptorSets"),
+ Param("const VK_DESCRIPTOR_SET_LAYOUT*", "pSetLayouts"),
+ Param("VK_DESCRIPTOR_SET*", "pDescriptorSets"),
Param("uint32_t*", "pCount")]),
Proto("void", "ClearDescriptorSets",
- [Param("XGL_DESCRIPTOR_POOL", "descriptorPool"),
+ [Param("VK_DESCRIPTOR_POOL", "descriptorPool"),
Param("uint32_t", "count"),
- Param("const XGL_DESCRIPTOR_SET*", "pDescriptorSets")]),
+ Param("const VK_DESCRIPTOR_SET*", "pDescriptorSets")]),
Proto("void", "UpdateDescriptors",
- [Param("XGL_DESCRIPTOR_SET", "descriptorSet"),
+ [Param("VK_DESCRIPTOR_SET", "descriptorSet"),
Param("uint32_t", "updateCount"),
Param("const void**", "ppUpdateArray")]),
- Proto("XGL_RESULT", "CreateDynamicViewportState",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_DYNAMIC_VP_STATE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_DYNAMIC_VP_STATE_OBJECT*", "pState")]),
+ Proto("VK_RESULT", "CreateDynamicViewportState",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_DYNAMIC_VP_STATE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_DYNAMIC_VP_STATE_OBJECT*", "pState")]),
- Proto("XGL_RESULT", "CreateDynamicRasterState",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_DYNAMIC_RS_STATE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_DYNAMIC_RS_STATE_OBJECT*", "pState")]),
+ Proto("VK_RESULT", "CreateDynamicRasterState",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_DYNAMIC_RS_STATE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_DYNAMIC_RS_STATE_OBJECT*", "pState")]),
- Proto("XGL_RESULT", "CreateDynamicColorBlendState",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_DYNAMIC_CB_STATE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_DYNAMIC_CB_STATE_OBJECT*", "pState")]),
+ Proto("VK_RESULT", "CreateDynamicColorBlendState",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_DYNAMIC_CB_STATE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_DYNAMIC_CB_STATE_OBJECT*", "pState")]),
- Proto("XGL_RESULT", "CreateDynamicDepthStencilState",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_DYNAMIC_DS_STATE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_DYNAMIC_DS_STATE_OBJECT*", "pState")]),
+ Proto("VK_RESULT", "CreateDynamicDepthStencilState",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_DYNAMIC_DS_STATE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_DYNAMIC_DS_STATE_OBJECT*", "pState")]),
- Proto("XGL_RESULT", "CreateCommandBuffer",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_CMD_BUFFER_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_CMD_BUFFER*", "pCmdBuffer")]),
+ Proto("VK_RESULT", "CreateCommandBuffer",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_CMD_BUFFER_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_CMD_BUFFER*", "pCmdBuffer")]),
- Proto("XGL_RESULT", "BeginCommandBuffer",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("const XGL_CMD_BUFFER_BEGIN_INFO*", "pBeginInfo")]),
+ Proto("VK_RESULT", "BeginCommandBuffer",
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("const VK_CMD_BUFFER_BEGIN_INFO*", "pBeginInfo")]),
- Proto("XGL_RESULT", "EndCommandBuffer",
- [Param("XGL_CMD_BUFFER", "cmdBuffer")]),
+ Proto("VK_RESULT", "EndCommandBuffer",
+ [Param("VK_CMD_BUFFER", "cmdBuffer")]),
- Proto("XGL_RESULT", "ResetCommandBuffer",
- [Param("XGL_CMD_BUFFER", "cmdBuffer")]),
+ Proto("VK_RESULT", "ResetCommandBuffer",
+ [Param("VK_CMD_BUFFER", "cmdBuffer")]),
Proto("void", "CmdBindPipeline",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
- Param("XGL_PIPELINE", "pipeline")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_PIPELINE_BIND_POINT", "pipelineBindPoint"),
+ Param("VK_PIPELINE", "pipeline")]),
Proto("void", "CmdBindDynamicStateObject",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_STATE_BIND_POINT", "stateBindPoint"),
- Param("XGL_DYNAMIC_STATE_OBJECT", "state")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_STATE_BIND_POINT", "stateBindPoint"),
+ Param("VK_DYNAMIC_STATE_OBJECT", "state")]),
Proto("void", "CmdBindDescriptorSets",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
- Param("XGL_DESCRIPTOR_SET_LAYOUT_CHAIN", "layoutChain"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_PIPELINE_BIND_POINT", "pipelineBindPoint"),
+ Param("VK_DESCRIPTOR_SET_LAYOUT_CHAIN", "layoutChain"),
Param("uint32_t", "layoutChainSlot"),
Param("uint32_t", "count"),
- Param("const XGL_DESCRIPTOR_SET*", "pDescriptorSets"),
+ Param("const VK_DESCRIPTOR_SET*", "pDescriptorSets"),
Param("const uint32_t*", "pUserData")]),
Proto("void", "CmdBindVertexBuffer",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_BUFFER", "buffer"),
- Param("XGL_GPU_SIZE", "offset"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_BUFFER", "buffer"),
+ Param("VK_GPU_SIZE", "offset"),
Param("uint32_t", "binding")]),
Proto("void", "CmdBindIndexBuffer",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_BUFFER", "buffer"),
- Param("XGL_GPU_SIZE", "offset"),
- Param("XGL_INDEX_TYPE", "indexType")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_BUFFER", "buffer"),
+ Param("VK_GPU_SIZE", "offset"),
+ Param("VK_INDEX_TYPE", "indexType")]),
Proto("void", "CmdDraw",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
Param("uint32_t", "firstVertex"),
Param("uint32_t", "vertexCount"),
Param("uint32_t", "firstInstance"),
Param("uint32_t", "instanceCount")]),
Proto("void", "CmdDrawIndexed",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
Param("uint32_t", "firstIndex"),
Param("uint32_t", "indexCount"),
Param("int32_t", "vertexOffset"),
@@ -644,321 +644,321 @@
Param("uint32_t", "instanceCount")]),
Proto("void", "CmdDrawIndirect",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_BUFFER", "buffer"),
- Param("XGL_GPU_SIZE", "offset"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_BUFFER", "buffer"),
+ Param("VK_GPU_SIZE", "offset"),
Param("uint32_t", "count"),
Param("uint32_t", "stride")]),
Proto("void", "CmdDrawIndexedIndirect",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_BUFFER", "buffer"),
- Param("XGL_GPU_SIZE", "offset"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_BUFFER", "buffer"),
+ Param("VK_GPU_SIZE", "offset"),
Param("uint32_t", "count"),
Param("uint32_t", "stride")]),
Proto("void", "CmdDispatch",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
Param("uint32_t", "x"),
Param("uint32_t", "y"),
Param("uint32_t", "z")]),
Proto("void", "CmdDispatchIndirect",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_BUFFER", "buffer"),
- Param("XGL_GPU_SIZE", "offset")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_BUFFER", "buffer"),
+ Param("VK_GPU_SIZE", "offset")]),
Proto("void", "CmdCopyBuffer",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_BUFFER", "srcBuffer"),
- Param("XGL_BUFFER", "destBuffer"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_BUFFER", "srcBuffer"),
+ Param("VK_BUFFER", "destBuffer"),
Param("uint32_t", "regionCount"),
- Param("const XGL_BUFFER_COPY*", "pRegions")]),
+ Param("const VK_BUFFER_COPY*", "pRegions")]),
Proto("void", "CmdCopyImage",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_IMAGE", "srcImage"),
- Param("XGL_IMAGE_LAYOUT", "srcImageLayout"),
- Param("XGL_IMAGE", "destImage"),
- Param("XGL_IMAGE_LAYOUT", "destImageLayout"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_IMAGE", "srcImage"),
+ Param("VK_IMAGE_LAYOUT", "srcImageLayout"),
+ Param("VK_IMAGE", "destImage"),
+ Param("VK_IMAGE_LAYOUT", "destImageLayout"),
Param("uint32_t", "regionCount"),
- Param("const XGL_IMAGE_COPY*", "pRegions")]),
+ Param("const VK_IMAGE_COPY*", "pRegions")]),
Proto("void", "CmdBlitImage",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_IMAGE", "srcImage"),
- Param("XGL_IMAGE_LAYOUT", "srcImageLayout"),
- Param("XGL_IMAGE", "destImage"),
- Param("XGL_IMAGE_LAYOUT", "destImageLayout"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_IMAGE", "srcImage"),
+ Param("VK_IMAGE_LAYOUT", "srcImageLayout"),
+ Param("VK_IMAGE", "destImage"),
+ Param("VK_IMAGE_LAYOUT", "destImageLayout"),
Param("uint32_t", "regionCount"),
- Param("const XGL_IMAGE_BLIT*", "pRegions")]),
+ Param("const VK_IMAGE_BLIT*", "pRegions")]),
Proto("void", "CmdCopyBufferToImage",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_BUFFER", "srcBuffer"),
- Param("XGL_IMAGE", "destImage"),
- Param("XGL_IMAGE_LAYOUT", "destImageLayout"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_BUFFER", "srcBuffer"),
+ Param("VK_IMAGE", "destImage"),
+ Param("VK_IMAGE_LAYOUT", "destImageLayout"),
Param("uint32_t", "regionCount"),
- Param("const XGL_BUFFER_IMAGE_COPY*", "pRegions")]),
+ Param("const VK_BUFFER_IMAGE_COPY*", "pRegions")]),
Proto("void", "CmdCopyImageToBuffer",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_IMAGE", "srcImage"),
- Param("XGL_IMAGE_LAYOUT", "srcImageLayout"),
- Param("XGL_BUFFER", "destBuffer"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_IMAGE", "srcImage"),
+ Param("VK_IMAGE_LAYOUT", "srcImageLayout"),
+ Param("VK_BUFFER", "destBuffer"),
Param("uint32_t", "regionCount"),
- Param("const XGL_BUFFER_IMAGE_COPY*", "pRegions")]),
+ Param("const VK_BUFFER_IMAGE_COPY*", "pRegions")]),
Proto("void", "CmdCloneImageData",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_IMAGE", "srcImage"),
- Param("XGL_IMAGE_LAYOUT", "srcImageLayout"),
- Param("XGL_IMAGE", "destImage"),
- Param("XGL_IMAGE_LAYOUT", "destImageLayout")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_IMAGE", "srcImage"),
+ Param("VK_IMAGE_LAYOUT", "srcImageLayout"),
+ Param("VK_IMAGE", "destImage"),
+ Param("VK_IMAGE_LAYOUT", "destImageLayout")]),
Proto("void", "CmdUpdateBuffer",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_BUFFER", "destBuffer"),
- Param("XGL_GPU_SIZE", "destOffset"),
- Param("XGL_GPU_SIZE", "dataSize"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_BUFFER", "destBuffer"),
+ Param("VK_GPU_SIZE", "destOffset"),
+ Param("VK_GPU_SIZE", "dataSize"),
Param("const uint32_t*", "pData")]),
Proto("void", "CmdFillBuffer",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_BUFFER", "destBuffer"),
- Param("XGL_GPU_SIZE", "destOffset"),
- Param("XGL_GPU_SIZE", "fillSize"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_BUFFER", "destBuffer"),
+ Param("VK_GPU_SIZE", "destOffset"),
+ Param("VK_GPU_SIZE", "fillSize"),
Param("uint32_t", "data")]),
Proto("void", "CmdClearColorImage",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_IMAGE", "image"),
- Param("XGL_IMAGE_LAYOUT", "imageLayout"),
- Param("XGL_CLEAR_COLOR", "color"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_IMAGE", "image"),
+ Param("VK_IMAGE_LAYOUT", "imageLayout"),
+ Param("VK_CLEAR_COLOR", "color"),
Param("uint32_t", "rangeCount"),
- Param("const XGL_IMAGE_SUBRESOURCE_RANGE*", "pRanges")]),
+ Param("const VK_IMAGE_SUBRESOURCE_RANGE*", "pRanges")]),
Proto("void", "CmdClearDepthStencil",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_IMAGE", "image"),
- Param("XGL_IMAGE_LAYOUT", "imageLayout"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_IMAGE", "image"),
+ Param("VK_IMAGE_LAYOUT", "imageLayout"),
Param("float", "depth"),
Param("uint32_t", "stencil"),
Param("uint32_t", "rangeCount"),
- Param("const XGL_IMAGE_SUBRESOURCE_RANGE*", "pRanges")]),
+ Param("const VK_IMAGE_SUBRESOURCE_RANGE*", "pRanges")]),
Proto("void", "CmdResolveImage",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_IMAGE", "srcImage"),
- Param("XGL_IMAGE_LAYOUT", "srcImageLayout"),
- Param("XGL_IMAGE", "destImage"),
- Param("XGL_IMAGE_LAYOUT", "destImageLayout"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_IMAGE", "srcImage"),
+ Param("VK_IMAGE_LAYOUT", "srcImageLayout"),
+ Param("VK_IMAGE", "destImage"),
+ Param("VK_IMAGE_LAYOUT", "destImageLayout"),
Param("uint32_t", "rectCount"),
- Param("const XGL_IMAGE_RESOLVE*", "pRects")]),
+ Param("const VK_IMAGE_RESOLVE*", "pRects")]),
Proto("void", "CmdSetEvent",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_EVENT", "event"),
- Param("XGL_PIPE_EVENT", "pipeEvent")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_EVENT", "event"),
+ Param("VK_PIPE_EVENT", "pipeEvent")]),
Proto("void", "CmdResetEvent",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_EVENT", "event"),
- Param("XGL_PIPE_EVENT", "pipeEvent")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_EVENT", "event"),
+ Param("VK_PIPE_EVENT", "pipeEvent")]),
Proto("void", "CmdWaitEvents",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("const XGL_EVENT_WAIT_INFO*", "pWaitInfo")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("const VK_EVENT_WAIT_INFO*", "pWaitInfo")]),
Proto("void", "CmdPipelineBarrier",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("const XGL_PIPELINE_BARRIER*", "pBarrier")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("const VK_PIPELINE_BARRIER*", "pBarrier")]),
Proto("void", "CmdBeginQuery",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_QUERY_POOL", "queryPool"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_QUERY_POOL", "queryPool"),
Param("uint32_t", "slot"),
- Param("XGL_FLAGS", "flags")]),
+ Param("VK_FLAGS", "flags")]),
Proto("void", "CmdEndQuery",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_QUERY_POOL", "queryPool"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_QUERY_POOL", "queryPool"),
Param("uint32_t", "slot")]),
Proto("void", "CmdResetQueryPool",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_QUERY_POOL", "queryPool"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_QUERY_POOL", "queryPool"),
Param("uint32_t", "startQuery"),
Param("uint32_t", "queryCount")]),
Proto("void", "CmdWriteTimestamp",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_TIMESTAMP_TYPE", "timestampType"),
- Param("XGL_BUFFER", "destBuffer"),
- Param("XGL_GPU_SIZE", "destOffset")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_TIMESTAMP_TYPE", "timestampType"),
+ Param("VK_BUFFER", "destBuffer"),
+ Param("VK_GPU_SIZE", "destOffset")]),
Proto("void", "CmdInitAtomicCounters",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_PIPELINE_BIND_POINT", "pipelineBindPoint"),
Param("uint32_t", "startCounter"),
Param("uint32_t", "counterCount"),
Param("const uint32_t*", "pData")]),
Proto("void", "CmdLoadAtomicCounters",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_PIPELINE_BIND_POINT", "pipelineBindPoint"),
Param("uint32_t", "startCounter"),
Param("uint32_t", "counterCount"),
- Param("XGL_BUFFER", "srcBuffer"),
- Param("XGL_GPU_SIZE", "srcOffset")]),
+ Param("VK_BUFFER", "srcBuffer"),
+ Param("VK_GPU_SIZE", "srcOffset")]),
Proto("void", "CmdSaveAtomicCounters",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_PIPELINE_BIND_POINT", "pipelineBindPoint"),
Param("uint32_t", "startCounter"),
Param("uint32_t", "counterCount"),
- Param("XGL_BUFFER", "destBuffer"),
- Param("XGL_GPU_SIZE", "destOffset")]),
+ Param("VK_BUFFER", "destBuffer"),
+ Param("VK_GPU_SIZE", "destOffset")]),
- Proto("XGL_RESULT", "CreateFramebuffer",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_FRAMEBUFFER_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_FRAMEBUFFER*", "pFramebuffer")]),
+ Proto("VK_RESULT", "CreateFramebuffer",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_FRAMEBUFFER_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_FRAMEBUFFER*", "pFramebuffer")]),
- Proto("XGL_RESULT", "CreateRenderPass",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_RENDER_PASS_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_RENDER_PASS*", "pRenderPass")]),
+ Proto("VK_RESULT", "CreateRenderPass",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_RENDER_PASS_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_RENDER_PASS*", "pRenderPass")]),
Proto("void", "CmdBeginRenderPass",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("const XGL_RENDER_PASS_BEGIN*", "pRenderPassBegin")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("const VK_RENDER_PASS_BEGIN*", "pRenderPassBegin")]),
Proto("void", "CmdEndRenderPass",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_RENDER_PASS", "renderPass")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
+ Param("VK_RENDER_PASS", "renderPass")]),
- Proto("XGL_RESULT", "DbgSetValidationLevel",
- [Param("XGL_DEVICE", "device"),
- Param("XGL_VALIDATION_LEVEL", "validationLevel")]),
+ Proto("VK_RESULT", "DbgSetValidationLevel",
+ [Param("VK_DEVICE", "device"),
+ Param("VK_VALIDATION_LEVEL", "validationLevel")]),
- Proto("XGL_RESULT", "DbgRegisterMsgCallback",
- [Param("XGL_INSTANCE", "instance"),
- Param("XGL_DBG_MSG_CALLBACK_FUNCTION", "pfnMsgCallback"),
+ Proto("VK_RESULT", "DbgRegisterMsgCallback",
+ [Param("VK_INSTANCE", "instance"),
+ Param("VK_DBG_MSG_CALLBACK_FUNCTION", "pfnMsgCallback"),
Param("void*", "pUserData")]),
- Proto("XGL_RESULT", "DbgUnregisterMsgCallback",
- [Param("XGL_INSTANCE", "instance"),
- Param("XGL_DBG_MSG_CALLBACK_FUNCTION", "pfnMsgCallback")]),
+ Proto("VK_RESULT", "DbgUnregisterMsgCallback",
+ [Param("VK_INSTANCE", "instance"),
+ Param("VK_DBG_MSG_CALLBACK_FUNCTION", "pfnMsgCallback")]),
- Proto("XGL_RESULT", "DbgSetMessageFilter",
- [Param("XGL_DEVICE", "device"),
+ Proto("VK_RESULT", "DbgSetMessageFilter",
+ [Param("VK_DEVICE", "device"),
Param("int32_t", "msgCode"),
- Param("XGL_DBG_MSG_FILTER", "filter")]),
+ Param("VK_DBG_MSG_FILTER", "filter")]),
- Proto("XGL_RESULT", "DbgSetObjectTag",
- [Param("XGL_BASE_OBJECT", "object"),
+ Proto("VK_RESULT", "DbgSetObjectTag",
+ [Param("VK_BASE_OBJECT", "object"),
Param("size_t", "tagSize"),
Param("const void*", "pTag")]),
- Proto("XGL_RESULT", "DbgSetGlobalOption",
- [Param("XGL_INSTANCE", "instance"),
- Param("XGL_DBG_GLOBAL_OPTION", "dbgOption"),
+ Proto("VK_RESULT", "DbgSetGlobalOption",
+ [Param("VK_INSTANCE", "instance"),
+ Param("VK_DBG_GLOBAL_OPTION", "dbgOption"),
Param("size_t", "dataSize"),
Param("const void*", "pData")]),
- Proto("XGL_RESULT", "DbgSetDeviceOption",
- [Param("XGL_DEVICE", "device"),
- Param("XGL_DBG_DEVICE_OPTION", "dbgOption"),
+ Proto("VK_RESULT", "DbgSetDeviceOption",
+ [Param("VK_DEVICE", "device"),
+ Param("VK_DBG_DEVICE_OPTION", "dbgOption"),
Param("size_t", "dataSize"),
Param("const void*", "pData")]),
Proto("void", "CmdDbgMarkerBegin",
- [Param("XGL_CMD_BUFFER", "cmdBuffer"),
+ [Param("VK_CMD_BUFFER", "cmdBuffer"),
Param("const char*", "pMarker")]),
Proto("void", "CmdDbgMarkerEnd",
- [Param("XGL_CMD_BUFFER", "cmdBuffer")]),
+ [Param("VK_CMD_BUFFER", "cmdBuffer")]),
],
)
wsi_x11 = Extension(
- name="XGL_WSI_X11",
+ name="VK_WSI_X11",
headers=["xglWsiX11Ext.h"],
objects=[],
protos=[
- Proto("XGL_RESULT", "WsiX11AssociateConnection",
- [Param("XGL_PHYSICAL_GPU", "gpu"),
- Param("const XGL_WSI_X11_CONNECTION_INFO*", "pConnectionInfo")]),
+ Proto("VK_RESULT", "WsiX11AssociateConnection",
+ [Param("VK_PHYSICAL_GPU", "gpu"),
+ Param("const VK_WSI_X11_CONNECTION_INFO*", "pConnectionInfo")]),
- Proto("XGL_RESULT", "WsiX11GetMSC",
- [Param("XGL_DEVICE", "device"),
+ Proto("VK_RESULT", "WsiX11GetMSC",
+ [Param("VK_DEVICE", "device"),
Param("xcb_window_t", "window"),
Param("xcb_randr_crtc_t", "crtc"),
Param("uint64_t*", "pMsc")]),
- Proto("XGL_RESULT", "WsiX11CreatePresentableImage",
- [Param("XGL_DEVICE", "device"),
- Param("const XGL_WSI_X11_PRESENTABLE_IMAGE_CREATE_INFO*", "pCreateInfo"),
- Param("XGL_IMAGE*", "pImage"),
- Param("XGL_GPU_MEMORY*", "pMem")]),
+ Proto("VK_RESULT", "WsiX11CreatePresentableImage",
+ [Param("VK_DEVICE", "device"),
+ Param("const VK_WSI_X11_PRESENTABLE_IMAGE_CREATE_INFO*", "pCreateInfo"),
+ Param("VK_IMAGE*", "pImage"),
+ Param("VK_GPU_MEMORY*", "pMem")]),
- Proto("XGL_RESULT", "WsiX11QueuePresent",
- [Param("XGL_QUEUE", "queue"),
- Param("const XGL_WSI_X11_PRESENT_INFO*", "pPresentInfo"),
- Param("XGL_FENCE", "fence")]),
+ Proto("VK_RESULT", "WsiX11QueuePresent",
+ [Param("VK_QUEUE", "queue"),
+ Param("const VK_WSI_X11_PRESENT_INFO*", "pPresentInfo"),
+ Param("VK_FENCE", "fence")]),
],
)
extensions = [core, wsi_x11]
object_root_list = [
- "XGL_INSTANCE",
- "XGL_PHYSICAL_GPU",
- "XGL_BASE_OBJECT"
+ "VK_INSTANCE",
+ "VK_PHYSICAL_GPU",
+ "VK_BASE_OBJECT"
]
object_base_list = [
- "XGL_DEVICE",
- "XGL_QUEUE",
- "XGL_GPU_MEMORY",
- "XGL_OBJECT"
+ "VK_DEVICE",
+ "VK_QUEUE",
+ "VK_GPU_MEMORY",
+ "VK_OBJECT"
]
object_list = [
- "XGL_BUFFER",
- "XGL_BUFFER_VIEW",
- "XGL_IMAGE",
- "XGL_IMAGE_VIEW",
- "XGL_COLOR_ATTACHMENT_VIEW",
- "XGL_DEPTH_STENCIL_VIEW",
- "XGL_SHADER",
- "XGL_PIPELINE",
- "XGL_SAMPLER",
- "XGL_DESCRIPTOR_SET",
- "XGL_DESCRIPTOR_SET_LAYOUT",
- "XGL_DESCRIPTOR_SET_LAYOUT_CHAIN",
- "XGL_DESCRIPTOR_POOL",
- "XGL_DYNAMIC_STATE_OBJECT",
- "XGL_CMD_BUFFER",
- "XGL_FENCE",
- "XGL_SEMAPHORE",
- "XGL_EVENT",
- "XGL_QUERY_POOL",
- "XGL_FRAMEBUFFER",
- "XGL_RENDER_PASS"
+ "VK_BUFFER",
+ "VK_BUFFER_VIEW",
+ "VK_IMAGE",
+ "VK_IMAGE_VIEW",
+ "VK_COLOR_ATTACHMENT_VIEW",
+ "VK_DEPTH_STENCIL_VIEW",
+ "VK_SHADER",
+ "VK_PIPELINE",
+ "VK_SAMPLER",
+ "VK_DESCRIPTOR_SET",
+ "VK_DESCRIPTOR_SET_LAYOUT",
+ "VK_DESCRIPTOR_SET_LAYOUT_CHAIN",
+ "VK_DESCRIPTOR_POOL",
+ "VK_DYNAMIC_STATE_OBJECT",
+ "VK_CMD_BUFFER",
+ "VK_FENCE",
+ "VK_SEMAPHORE",
+ "VK_EVENT",
+ "VK_QUERY_POOL",
+ "VK_FRAMEBUFFER",
+ "VK_RENDER_PASS"
]
object_dynamic_state_list = [
- "XGL_DYNAMIC_VP_STATE_OBJECT",
- "XGL_DYNAMIC_RS_STATE_OBJECT",
- "XGL_DYNAMIC_CB_STATE_OBJECT",
- "XGL_DYNAMIC_DS_STATE_OBJECT"
+ "VK_DYNAMIC_VP_STATE_OBJECT",
+ "VK_DYNAMIC_RS_STATE_OBJECT",
+ "VK_DYNAMIC_CB_STATE_OBJECT",
+ "VK_DYNAMIC_DS_STATE_OBJECT"
]
object_type_list = object_root_list + object_base_list + object_list + object_dynamic_state_list
-object_parent_list = ["XGL_BASE_OBJECT", "XGL_OBJECT", "XGL_DYNAMIC_STATE_OBJECT"]
+object_parent_list = ["VK_BASE_OBJECT", "VK_OBJECT", "VK_DYNAMIC_STATE_OBJECT"]
headers = []
objects = []
@@ -977,7 +977,7 @@
with open(filename, "r") as fp:
for line in fp:
line = line.strip()
- if line.startswith("XGL_DEFINE"):
+ if line.startswith("VK_DEFINE"):
begin = line.find("(") + 1
end = line.find(",")
# extract the object type
@@ -989,7 +989,7 @@
# parse proto_lines to protos
protos = []
for line in proto_lines:
- first, rest = line.split(" (XGLAPI *xgl")
+ first, rest = line.split(" (VKAPI *vk")
second, third = rest.split("Type)(")
# get the return type, no space before "*"
@@ -1017,18 +1017,18 @@
protos.append(Proto(proto_ret, proto_name, params))
# make them an extension and print
- ext = Extension("XGL_CORE",
- headers=["xgl.h", "xglDbg.h"],
+ ext = Extension("VK_CORE",
+ headers=["vulkan.h", "xglDbg.h"],
objects=object_lines,
protos=protos)
print("core =", str(ext))
print("")
- print("typedef struct _XGL_LAYER_DISPATCH_TABLE")
+ print("typedef struct _VK_LAYER_DISPATCH_TABLE")
print("{")
for proto in ext.protos:
- print(" xgl%sType %s;" % (proto.name, proto.name))
- print("} XGL_LAYER_DISPATCH_TABLE;")
+ print(" vk%sType %s;" % (proto.name, proto.name))
+ print("} VK_LAYER_DISPATCH_TABLE;")
if __name__ == "__main__":
- parse_xgl_h("include/xgl.h")
+ parse_xgl_h("include/vulkan.h")