xgl:  Remove XGL_* typedef wrappers

Part of moving to xgl.h rev#38, svn rev 29293-29302
diff --git a/xgl.py b/xgl.py
index d072877..22baba5 100644
--- a/xgl.py
+++ b/xgl.py
@@ -219,19 +219,19 @@
         Proto("XGL_RESULT", "InitAndEnumerateGpus",
             [Param("const XGL_APPLICATION_INFO*", "pAppInfo"),
              Param("const XGL_ALLOC_CALLBACKS*", "pAllocCb"),
-             Param("XGL_UINT", "maxGpus"),
-             Param("XGL_UINT*", "pGpuCount"),
+             Param("uint32_t", "maxGpus"),
+             Param("uint32_t*", "pGpuCount"),
              Param("XGL_PHYSICAL_GPU*", "pGpus")]),
 
         Proto("XGL_RESULT", "GetGpuInfo",
             [Param("XGL_PHYSICAL_GPU", "gpu"),
              Param("XGL_PHYSICAL_GPU_INFO_TYPE", "infoType"),
-             Param("XGL_SIZE*", "pDataSize"),
-             Param("XGL_VOID*", "pData")]),
+             Param("size_t*", "pDataSize"),
+             Param("void*", "pData")]),
 
-        Proto("XGL_VOID*", "GetProcAddr",
+        Proto("void*", "GetProcAddr",
             [Param("XGL_PHYSICAL_GPU", "gpu"),
-             Param("const XGL_CHAR*", "pName")]),
+             Param("const char*", "pName")]),
 
         Proto("XGL_RESULT", "CreateDevice",
             [Param("XGL_PHYSICAL_GPU", "gpu"),
@@ -243,33 +243,33 @@
 
         Proto("XGL_RESULT", "GetExtensionSupport",
             [Param("XGL_PHYSICAL_GPU", "gpu"),
-             Param("const XGL_CHAR*", "pExtName")]),
+             Param("const char*", "pExtName")]),
 
         Proto("XGL_RESULT", "EnumerateLayers",
             [Param("XGL_PHYSICAL_GPU", "gpu"),
-             Param("XGL_SIZE", "maxLayerCount"),
-             Param("XGL_SIZE", "maxStringSize"),
-             Param("XGL_SIZE*", "pOutLayerCount"),
-             Param("XGL_CHAR* const*", "pOutLayers"),
-             Param("XGL_VOID*", "pReserved")]),
+             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"),
              Param("XGL_QUEUE_TYPE", "queueType"),
-             Param("XGL_UINT", "queueIndex"),
+             Param("uint32_t", "queueIndex"),
              Param("XGL_QUEUE*", "pQueue")]),
 
         Proto("XGL_RESULT", "QueueSubmit",
             [Param("XGL_QUEUE", "queue"),
-             Param("XGL_UINT", "cmdBufferCount"),
+             Param("uint32_t", "cmdBufferCount"),
              Param("const XGL_CMD_BUFFER*", "pCmdBuffers"),
-             Param("XGL_UINT", "memRefCount"),
+             Param("uint32_t", "memRefCount"),
              Param("const XGL_MEMORY_REF*", "pMemRefs"),
              Param("XGL_FENCE", "fence")]),
 
         Proto("XGL_RESULT", "QueueSetGlobalMemReferences",
             [Param("XGL_QUEUE", "queue"),
-             Param("XGL_UINT", "memRefCount"),
+             Param("uint32_t", "memRefCount"),
              Param("const XGL_MEMORY_REF*", "pMemRefs")]),
 
         Proto("XGL_RESULT", "QueueWaitIdle",
@@ -293,15 +293,15 @@
         Proto("XGL_RESULT", "MapMemory",
             [Param("XGL_GPU_MEMORY", "mem"),
              Param("XGL_FLAGS", "flags"),
-             Param("XGL_VOID**", "ppData")]),
+             Param("void**", "ppData")]),
 
         Proto("XGL_RESULT", "UnmapMemory",
             [Param("XGL_GPU_MEMORY", "mem")]),
 
         Proto("XGL_RESULT", "PinSystemMemory",
             [Param("XGL_DEVICE", "device"),
-             Param("const XGL_VOID*", "pSysMem"),
-             Param("XGL_SIZE", "memSize"),
+             Param("const void*", "pSysMem"),
+             Param("size_t", "memSize"),
              Param("XGL_GPU_MEMORY*", "pMem")]),
 
         Proto("XGL_RESULT", "GetMultiGpuCompatibility",
@@ -336,18 +336,18 @@
         Proto("XGL_RESULT", "GetObjectInfo",
             [Param("XGL_BASE_OBJECT", "object"),
              Param("XGL_OBJECT_INFO_TYPE", "infoType"),
-             Param("XGL_SIZE*", "pDataSize"),
-             Param("XGL_VOID*", "pData")]),
+             Param("size_t*", "pDataSize"),
+             Param("void*", "pData")]),
 
         Proto("XGL_RESULT", "BindObjectMemory",
             [Param("XGL_OBJECT", "object"),
-             Param("XGL_UINT", "allocationIdx"),
+             Param("uint32_t", "allocationIdx"),
              Param("XGL_GPU_MEMORY", "mem"),
              Param("XGL_GPU_SIZE", "memOffset")]),
 
         Proto("XGL_RESULT", "BindObjectMemoryRange",
             [Param("XGL_OBJECT", "object"),
-             Param("XGL_UINT", "allocationIdx"),
+             Param("uint32_t", "allocationIdx"),
              Param("XGL_GPU_SIZE", "rangeOffset"),
              Param("XGL_GPU_SIZE", "rangeSize"),
              Param("XGL_GPU_MEMORY", "mem"),
@@ -355,7 +355,7 @@
 
         Proto("XGL_RESULT", "BindImageMemoryRange",
             [Param("XGL_IMAGE", "image"),
-             Param("XGL_UINT", "allocationIdx"),
+             Param("uint32_t", "allocationIdx"),
              Param("const XGL_IMAGE_MEMORY_BIND_INFO*", "bindInfo"),
              Param("XGL_GPU_MEMORY", "mem"),
              Param("XGL_GPU_SIZE", "memOffset")]),
@@ -370,10 +370,10 @@
 
         Proto("XGL_RESULT", "WaitForFences",
             [Param("XGL_DEVICE", "device"),
-             Param("XGL_UINT", "fenceCount"),
+             Param("uint32_t", "fenceCount"),
              Param("const XGL_FENCE*", "pFences"),
-             Param("XGL_BOOL", "waitAll"),
-             Param("XGL_UINT64", "timeout")]),
+             Param("bool32_t", "waitAll"),
+             Param("uint64_t", "timeout")]),
 
         Proto("XGL_RESULT", "CreateQueueSemaphore",
             [Param("XGL_DEVICE", "device"),
@@ -409,17 +409,17 @@
 
         Proto("XGL_RESULT", "GetQueryPoolResults",
             [Param("XGL_QUERY_POOL", "queryPool"),
-             Param("XGL_UINT", "startQuery"),
-             Param("XGL_UINT", "queryCount"),
-             Param("XGL_SIZE*", "pDataSize"),
-             Param("XGL_VOID*", "pData")]),
+             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"),
-             Param("XGL_SIZE*", "pDataSize"),
-             Param("XGL_VOID*", "pData")]),
+             Param("size_t*", "pDataSize"),
+             Param("void*", "pData")]),
 
         Proto("XGL_RESULT", "CreateBuffer",
             [Param("XGL_DEVICE", "device"),
@@ -438,18 +438,18 @@
 
         Proto("XGL_RESULT", "SetFastClearColor",
             [Param("XGL_IMAGE", "pImage"),
-             Param("const XGL_FLOAT[4]", "color")]),
+             Param("const float[4]", "color")]),
 
         Proto("XGL_RESULT", "SetFastClearDepth",
             [Param("XGL_IMAGE", "pImage"),
-             Param("XGL_FLOAT", "depth")]),
+             Param("float", "depth")]),
 
         Proto("XGL_RESULT", "GetImageSubresourceInfo",
             [Param("XGL_IMAGE", "image"),
              Param("const XGL_IMAGE_SUBRESOURCE*", "pSubresource"),
              Param("XGL_SUBRESOURCE_INFO_TYPE", "infoType"),
-             Param("XGL_SIZE*", "pDataSize"),
-             Param("XGL_VOID*", "pData")]),
+             Param("size_t*", "pDataSize"),
+             Param("void*", "pData")]),
 
         Proto("XGL_RESULT", "CreateImageView",
             [Param("XGL_DEVICE", "device"),
@@ -483,13 +483,13 @@
 
         Proto("XGL_RESULT", "StorePipeline",
             [Param("XGL_PIPELINE", "pipeline"),
-             Param("XGL_SIZE*", "pDataSize"),
-             Param("XGL_VOID*", "pData")]),
+             Param("size_t*", "pDataSize"),
+             Param("void*", "pData")]),
 
         Proto("XGL_RESULT", "LoadPipeline",
             [Param("XGL_DEVICE", "device"),
-             Param("XGL_SIZE", "dataSize"),
-             Param("const XGL_VOID*", "pData"),
+             Param("size_t", "dataSize"),
+             Param("const void*", "pData"),
              Param("XGL_PIPELINE*", "pPipeline")]),
 
         Proto("XGL_RESULT", "CreatePipelineDelta",
@@ -506,7 +506,7 @@
         Proto("XGL_RESULT", "CreateDescriptorSetLayout",
             [Param("XGL_DEVICE", "device"),
              Param("XGL_FLAGS", "stageFlags"),
-             Param("const XGL_UINT*", "pSetBindPoints"),
+             Param("const uint32_t*", "pSetBindPoints"),
              Param("XGL_DESCRIPTOR_SET_LAYOUT", "priorSetLayout"),
              Param("const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*", "pSetLayoutInfoList"),
              Param("XGL_DESCRIPTOR_SET_LAYOUT*", "pSetLayout")]),
@@ -522,7 +522,7 @@
         Proto("XGL_RESULT", "CreateDescriptorRegion",
             [Param("XGL_DEVICE", "device"),
              Param("XGL_DESCRIPTOR_REGION_USAGE", "regionUsage"),
-             Param("XGL_UINT", "maxSets"),
+             Param("uint32_t", "maxSets"),
              Param("const XGL_DESCRIPTOR_REGION_CREATE_INFO*", "pCreateInfo"),
              Param("XGL_DESCRIPTOR_REGION*", "pDescriptorRegion")]),
 
@@ -532,19 +532,19 @@
         Proto("XGL_RESULT", "AllocDescriptorSets",
             [Param("XGL_DESCRIPTOR_REGION", "descriptorRegion"),
              Param("XGL_DESCRIPTOR_SET_USAGE", "setUsage"),
-             Param("XGL_UINT", "count"),
+             Param("uint32_t", "count"),
              Param("const XGL_DESCRIPTOR_SET_LAYOUT*", "pSetLayouts"),
              Param("XGL_DESCRIPTOR_SET*", "pDescriptorSets"),
-             Param("XGL_UINT*", "pCount")]),
+             Param("uint32_t*", "pCount")]),
 
-        Proto("XGL_VOID", "ClearDescriptorSets",
+        Proto("void", "ClearDescriptorSets",
             [Param("XGL_DESCRIPTOR_REGION", "descriptorRegion"),
-             Param("XGL_UINT", "count"),
+             Param("uint32_t", "count"),
              Param("const XGL_DESCRIPTOR_SET*", "pDescriptorSets")]),
 
-        Proto("XGL_VOID", "UpdateDescriptors",
+        Proto("void", "UpdateDescriptors",
             [Param("XGL_DESCRIPTOR_SET", "descriptorSet"),
-             Param("const XGL_VOID*", "pUpdateChain")]),
+             Param("const void*", "pUpdateChain")]),
 
         Proto("XGL_RESULT", "CreateDynamicViewportState",
             [Param("XGL_DEVICE", "device"),
@@ -581,217 +581,217 @@
         Proto("XGL_RESULT", "ResetCommandBuffer",
             [Param("XGL_CMD_BUFFER", "cmdBuffer")]),
 
-        Proto("XGL_VOID", "CmdBindPipeline",
+        Proto("void", "CmdBindPipeline",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
              Param("XGL_PIPELINE", "pipeline")]),
 
-        Proto("XGL_VOID", "CmdBindPipelineDelta",
+        Proto("void", "CmdBindPipelineDelta",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
              Param("XGL_PIPELINE_DELTA", "delta")]),
 
-        Proto("XGL_VOID", "CmdBindDynamicStateObject",
+        Proto("void", "CmdBindDynamicStateObject",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_STATE_BIND_POINT", "stateBindPoint"),
              Param("XGL_DYNAMIC_STATE_OBJECT", "state")]),
 
-        Proto("XGL_VOID", "CmdBindDescriptorSet",
+        Proto("void", "CmdBindDescriptorSet",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
              Param("XGL_DESCRIPTOR_SET", "descriptorSet"),
-             Param("const XGL_UINT*", "pUserData")]),
+             Param("const uint32_t*", "pUserData")]),
 
-        Proto("XGL_VOID", "CmdBindVertexBuffer",
+        Proto("void", "CmdBindVertexBuffer",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_BUFFER", "buffer"),
              Param("XGL_GPU_SIZE", "offset"),
-             Param("XGL_UINT", "binding")]),
+             Param("uint32_t", "binding")]),
 
-        Proto("XGL_VOID", "CmdBindIndexBuffer",
+        Proto("void", "CmdBindIndexBuffer",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_BUFFER", "buffer"),
              Param("XGL_GPU_SIZE", "offset"),
              Param("XGL_INDEX_TYPE", "indexType")]),
 
-        Proto("XGL_VOID", "CmdDraw",
+        Proto("void", "CmdDraw",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
-             Param("XGL_UINT", "firstVertex"),
-             Param("XGL_UINT", "vertexCount"),
-             Param("XGL_UINT", "firstInstance"),
-             Param("XGL_UINT", "instanceCount")]),
+             Param("uint32_t", "firstVertex"),
+             Param("uint32_t", "vertexCount"),
+             Param("uint32_t", "firstInstance"),
+             Param("uint32_t", "instanceCount")]),
 
-        Proto("XGL_VOID", "CmdDrawIndexed",
+        Proto("void", "CmdDrawIndexed",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
-             Param("XGL_UINT", "firstIndex"),
-             Param("XGL_UINT", "indexCount"),
-             Param("XGL_INT", "vertexOffset"),
-             Param("XGL_UINT", "firstInstance"),
-             Param("XGL_UINT", "instanceCount")]),
+             Param("uint32_t", "firstIndex"),
+             Param("uint32_t", "indexCount"),
+             Param("int32_t", "vertexOffset"),
+             Param("uint32_t", "firstInstance"),
+             Param("uint32_t", "instanceCount")]),
 
-        Proto("XGL_VOID", "CmdDrawIndirect",
+        Proto("void", "CmdDrawIndirect",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_BUFFER", "buffer"),
              Param("XGL_GPU_SIZE", "offset"),
-             Param("XGL_UINT32", "count"),
-             Param("XGL_UINT32", "stride")]),
+             Param("uint32_t", "count"),
+             Param("uint32_t", "stride")]),
 
-        Proto("XGL_VOID", "CmdDrawIndexedIndirect",
+        Proto("void", "CmdDrawIndexedIndirect",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_BUFFER", "buffer"),
              Param("XGL_GPU_SIZE", "offset"),
-             Param("XGL_UINT32", "count"),
-             Param("XGL_UINT32", "stride")]),
+             Param("uint32_t", "count"),
+             Param("uint32_t", "stride")]),
 
-        Proto("XGL_VOID", "CmdDispatch",
+        Proto("void", "CmdDispatch",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
-             Param("XGL_UINT", "x"),
-             Param("XGL_UINT", "y"),
-             Param("XGL_UINT", "z")]),
+             Param("uint32_t", "x"),
+             Param("uint32_t", "y"),
+             Param("uint32_t", "z")]),
 
-        Proto("XGL_VOID", "CmdDispatchIndirect",
+        Proto("void", "CmdDispatchIndirect",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_BUFFER", "buffer"),
              Param("XGL_GPU_SIZE", "offset")]),
 
-        Proto("XGL_VOID", "CmdCopyBuffer",
+        Proto("void", "CmdCopyBuffer",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_BUFFER", "srcBuffer"),
              Param("XGL_BUFFER", "destBuffer"),
-             Param("XGL_UINT", "regionCount"),
+             Param("uint32_t", "regionCount"),
              Param("const XGL_BUFFER_COPY*", "pRegions")]),
 
-        Proto("XGL_VOID", "CmdCopyImage",
+        Proto("void", "CmdCopyImage",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_IMAGE", "srcImage"),
              Param("XGL_IMAGE", "destImage"),
-             Param("XGL_UINT", "regionCount"),
+             Param("uint32_t", "regionCount"),
              Param("const XGL_IMAGE_COPY*", "pRegions")]),
 
-        Proto("XGL_VOID", "CmdCopyBufferToImage",
+        Proto("void", "CmdCopyBufferToImage",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_BUFFER", "srcBuffer"),
              Param("XGL_IMAGE", "destImage"),
-             Param("XGL_UINT", "regionCount"),
+             Param("uint32_t", "regionCount"),
              Param("const XGL_BUFFER_IMAGE_COPY*", "pRegions")]),
 
-        Proto("XGL_VOID", "CmdCopyImageToBuffer",
+        Proto("void", "CmdCopyImageToBuffer",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_IMAGE", "srcImage"),
              Param("XGL_BUFFER", "destBuffer"),
-             Param("XGL_UINT", "regionCount"),
+             Param("uint32_t", "regionCount"),
              Param("const XGL_BUFFER_IMAGE_COPY*", "pRegions")]),
 
-        Proto("XGL_VOID", "CmdCloneImageData",
+        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")]),
 
-        Proto("XGL_VOID", "CmdUpdateBuffer",
+        Proto("void", "CmdUpdateBuffer",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_BUFFER", "destBuffer"),
              Param("XGL_GPU_SIZE", "destOffset"),
              Param("XGL_GPU_SIZE", "dataSize"),
-             Param("const XGL_UINT32*", "pData")]),
+             Param("const uint32_t*", "pData")]),
 
-        Proto("XGL_VOID", "CmdFillBuffer",
+        Proto("void", "CmdFillBuffer",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_BUFFER", "destBuffer"),
              Param("XGL_GPU_SIZE", "destOffset"),
              Param("XGL_GPU_SIZE", "fillSize"),
-             Param("XGL_UINT32", "data")]),
+             Param("uint32_t", "data")]),
 
-        Proto("XGL_VOID", "CmdClearColorImage",
+        Proto("void", "CmdClearColorImage",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_IMAGE", "image"),
-             Param("const XGL_FLOAT[4]", "color"),
-             Param("XGL_UINT", "rangeCount"),
+             Param("const float[4]", "color"),
+             Param("uint32_t", "rangeCount"),
              Param("const XGL_IMAGE_SUBRESOURCE_RANGE*", "pRanges")]),
 
-        Proto("XGL_VOID", "CmdClearColorImageRaw",
+        Proto("void", "CmdClearColorImageRaw",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_IMAGE", "image"),
-             Param("const XGL_UINT32[4]", "color"),
-             Param("XGL_UINT", "rangeCount"),
+             Param("const uint32_t[4]", "color"),
+             Param("uint32_t", "rangeCount"),
              Param("const XGL_IMAGE_SUBRESOURCE_RANGE*", "pRanges")]),
 
-        Proto("XGL_VOID", "CmdClearDepthStencil",
+        Proto("void", "CmdClearDepthStencil",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_IMAGE", "image"),
-             Param("XGL_FLOAT", "depth"),
-             Param("XGL_UINT32", "stencil"),
-             Param("XGL_UINT", "rangeCount"),
+             Param("float", "depth"),
+             Param("uint32_t", "stencil"),
+             Param("uint32_t", "rangeCount"),
              Param("const XGL_IMAGE_SUBRESOURCE_RANGE*", "pRanges")]),
 
-        Proto("XGL_VOID", "CmdResolveImage",
+        Proto("void", "CmdResolveImage",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_IMAGE", "srcImage"),
              Param("XGL_IMAGE", "destImage"),
-             Param("XGL_UINT", "rectCount"),
+             Param("uint32_t", "rectCount"),
              Param("const XGL_IMAGE_RESOLVE*", "pRects")]),
 
-        Proto("XGL_VOID", "CmdSetEvent",
+        Proto("void", "CmdSetEvent",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_EVENT", "event"),
              Param("XGL_SET_EVENT", "pipeEvent")]),
 
-        Proto("XGL_VOID", "CmdResetEvent",
+        Proto("void", "CmdResetEvent",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_EVENT", "event")]),
 
-        Proto("XGL_VOID", "CmdWaitEvents",
+        Proto("void", "CmdWaitEvents",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("const XGL_EVENT_WAIT_INFO*", "pWaitInfo")]),
 
-        Proto("XGL_VOID", "CmdPipelineBarrier",
+        Proto("void", "CmdPipelineBarrier",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("const XGL_PIPELINE_BARRIER*", "pBarrier")]),
 
-        Proto("XGL_VOID", "CmdBeginQuery",
+        Proto("void", "CmdBeginQuery",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_QUERY_POOL", "queryPool"),
-             Param("XGL_UINT", "slot"),
+             Param("uint32_t", "slot"),
              Param("XGL_FLAGS", "flags")]),
 
-        Proto("XGL_VOID", "CmdEndQuery",
+        Proto("void", "CmdEndQuery",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_QUERY_POOL", "queryPool"),
-             Param("XGL_UINT", "slot")]),
+             Param("uint32_t", "slot")]),
 
-        Proto("XGL_VOID", "CmdResetQueryPool",
+        Proto("void", "CmdResetQueryPool",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_QUERY_POOL", "queryPool"),
-             Param("XGL_UINT", "startQuery"),
-             Param("XGL_UINT", "queryCount")]),
+             Param("uint32_t", "startQuery"),
+             Param("uint32_t", "queryCount")]),
 
-        Proto("XGL_VOID", "CmdWriteTimestamp",
+        Proto("void", "CmdWriteTimestamp",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_TIMESTAMP_TYPE", "timestampType"),
              Param("XGL_BUFFER", "destBuffer"),
              Param("XGL_GPU_SIZE", "destOffset")]),
 
-        Proto("XGL_VOID", "CmdInitAtomicCounters",
+        Proto("void", "CmdInitAtomicCounters",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
-             Param("XGL_UINT", "startCounter"),
-             Param("XGL_UINT", "counterCount"),
-             Param("const XGL_UINT32*", "pData")]),
+             Param("uint32_t", "startCounter"),
+             Param("uint32_t", "counterCount"),
+             Param("const uint32_t*", "pData")]),
 
-        Proto("XGL_VOID", "CmdLoadAtomicCounters",
+        Proto("void", "CmdLoadAtomicCounters",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
-             Param("XGL_UINT", "startCounter"),
-             Param("XGL_UINT", "counterCount"),
+             Param("uint32_t", "startCounter"),
+             Param("uint32_t", "counterCount"),
              Param("XGL_BUFFER", "srcBuffer"),
              Param("XGL_GPU_SIZE", "srcOffset")]),
 
-        Proto("XGL_VOID", "CmdSaveAtomicCounters",
+        Proto("void", "CmdSaveAtomicCounters",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
-             Param("XGL_UINT", "startCounter"),
-             Param("XGL_UINT", "counterCount"),
+             Param("uint32_t", "startCounter"),
+             Param("uint32_t", "counterCount"),
              Param("XGL_BUFFER", "destBuffer"),
              Param("XGL_GPU_SIZE", "destOffset")]),
 
@@ -811,37 +811,37 @@
 
         Proto("XGL_RESULT", "DbgRegisterMsgCallback",
             [Param("XGL_DBG_MSG_CALLBACK_FUNCTION", "pfnMsgCallback"),
-             Param("XGL_VOID*", "pUserData")]),
+             Param("void*", "pUserData")]),
 
         Proto("XGL_RESULT", "DbgUnregisterMsgCallback",
             [Param("XGL_DBG_MSG_CALLBACK_FUNCTION", "pfnMsgCallback")]),
 
         Proto("XGL_RESULT", "DbgSetMessageFilter",
             [Param("XGL_DEVICE", "device"),
-             Param("XGL_INT", "msgCode"),
+             Param("int32_t", "msgCode"),
              Param("XGL_DBG_MSG_FILTER", "filter")]),
 
         Proto("XGL_RESULT", "DbgSetObjectTag",
             [Param("XGL_BASE_OBJECT", "object"),
-             Param("XGL_SIZE", "tagSize"),
-             Param("const XGL_VOID*", "pTag")]),
+             Param("size_t", "tagSize"),
+             Param("const void*", "pTag")]),
 
         Proto("XGL_RESULT", "DbgSetGlobalOption",
             [Param("XGL_DBG_GLOBAL_OPTION", "dbgOption"),
-             Param("XGL_SIZE", "dataSize"),
-             Param("const XGL_VOID*", "pData")]),
+             Param("size_t", "dataSize"),
+             Param("const void*", "pData")]),
 
         Proto("XGL_RESULT", "DbgSetDeviceOption",
             [Param("XGL_DEVICE", "device"),
              Param("XGL_DBG_DEVICE_OPTION", "dbgOption"),
-             Param("XGL_SIZE", "dataSize"),
-             Param("const XGL_VOID*", "pData")]),
+             Param("size_t", "dataSize"),
+             Param("const void*", "pData")]),
 
-        Proto("XGL_VOID", "CmdDbgMarkerBegin",
+        Proto("void", "CmdDbgMarkerBegin",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
-             Param("const XGL_CHAR*", "pMarker")]),
+             Param("const char*", "pMarker")]),
 
-        Proto("XGL_VOID", "CmdDbgMarkerEnd",
+        Proto("void", "CmdDbgMarkerEnd",
             [Param("XGL_CMD_BUFFER", "cmdBuffer")]),
     ],
 )
@@ -859,7 +859,7 @@
             [Param("XGL_DEVICE", "device"),
              Param("xcb_window_t", "window"),
              Param("xcb_randr_crtc_t", "crtc"),
-             Param("XGL_UINT64*", "pMsc")]),
+             Param("uint64_t*", "pMsc")]),
 
         Proto("XGL_RESULT", "WsiX11CreatePresentableImage",
             [Param("XGL_DEVICE", "device"),