update for buffer object changes
diff --git a/xgl.py b/xgl.py
index 2297f94..ef59f80 100644
--- a/xgl.py
+++ b/xgl.py
@@ -189,6 +189,8 @@
"XGL_QUEUE",
"XGL_GPU_MEMORY",
"XGL_OBJECT",
+ "XGL_BUFFER",
+ "XGL_BUFFER_VIEW",
"XGL_IMAGE",
"XGL_IMAGE_VIEW",
"XGL_COLOR_ATTACHMENT_VIEW",
@@ -210,7 +212,7 @@
"XGL_EVENT",
"XGL_QUERY_POOL",
"XGL_FRAMEBUFFER",
- "XGL_RENDER_PASS"
+ "XGL_RENDER_PASS",
],
protos=[
Proto("XGL_RESULT", "InitAndEnumerateGpus",
@@ -312,15 +314,6 @@
Param("XGL_SIZE", "memSize"),
Param("XGL_GPU_MEMORY*", "pMem")]),
- Proto("XGL_RESULT", "RemapVirtualMemoryPages",
- [Param("XGL_DEVICE", "device"),
- Param("XGL_UINT", "rangeCount"),
- Param("const XGL_VIRTUAL_MEMORY_REMAP_RANGE*", "pRanges"),
- Param("XGL_UINT", "preWaitSemaphoreCount"),
- Param("const XGL_QUEUE_SEMAPHORE*", "pPreWaitSemaphores"),
- Param("XGL_UINT", "postSignalSemaphoreCount"),
- Param("const XGL_QUEUE_SEMAPHORE*", "pPostSignalSemaphores")]),
-
Proto("XGL_RESULT", "GetMultiGpuCompatibility",
[Param("XGL_PHYSICAL_GPU", "gpu0"),
Param("XGL_PHYSICAL_GPU", "gpu1"),
@@ -359,7 +352,20 @@
Proto("XGL_RESULT", "BindObjectMemory",
[Param("XGL_OBJECT", "object"),
Param("XGL_GPU_MEMORY", "mem"),
- Param("XGL_GPU_SIZE", "offset")]),
+ Param("XGL_GPU_SIZE", "memOffset")]),
+
+ Proto("XGL_RESULT", "BindObjectMemoryRange",
+ [Param("XGL_OBJECT", "object"),
+ Param("XGL_GPU_SIZE", "rangeOffset"),
+ Param("XGL_GPU_SIZE", "rangeSize"),
+ Param("XGL_GPU_MEMORY", "mem"),
+ Param("XGL_GPU_SIZE", "memOffset")]),
+
+ Proto("XGL_RESULT", "BindImageMemoryRange",
+ [Param("XGL_IMAGE", "image"),
+ Param("const XGL_IMAGE_MEMORY_BIND_INFO*", "bindInfo"),
+ Param("XGL_GPU_MEMORY", "mem"),
+ Param("XGL_GPU_SIZE", "memOffset")]),
Proto("XGL_RESULT", "CreateFence",
[Param("XGL_DEVICE", "device"),
@@ -422,6 +428,16 @@
Param("XGL_SIZE*", "pDataSize"),
Param("XGL_VOID*", "pData")]),
+ Proto("XGL_RESULT", "CreateBuffer",
+ [Param("XGL_DEVICE", "device"),
+ Param("const XGL_BUFFER_CREATE_INFO*", "pCreateInfo"),
+ Param("XGL_BUFFER*", "pBuffer")]),
+
+ Proto("XGL_RESULT", "CreateBufferView",
+ [Param("XGL_DEVICE", "device"),
+ Param("const XGL_BUFFER_VIEW_CREATE_INFO*", "pCreateInfo"),
+ Param("XGL_BUFFER_VIEW*", "pView")]),
+
Proto("XGL_RESULT", "CreateImage",
[Param("XGL_DEVICE", "device"),
Param("const XGL_IMAGE_CREATE_INFO*", "pCreateInfo"),
@@ -509,11 +525,11 @@
Param("XGL_UINT", "slotCount"),
Param("const XGL_IMAGE_VIEW_ATTACH_INFO*", "pImageViews")]),
- Proto("XGL_VOID", "AttachMemoryViewDescriptors",
+ Proto("XGL_VOID", "AttachBufferViewDescriptors",
[Param("XGL_DESCRIPTOR_SET", "descriptorSet"),
Param("XGL_UINT", "startSlot"),
Param("XGL_UINT", "slotCount"),
- Param("const XGL_MEMORY_VIEW_ATTACH_INFO*", "pMemViews")]),
+ Param("const XGL_BUFFER_VIEW_ATTACH_INFO*", "pBufferViews")]),
Proto("XGL_VOID", "AttachNestedDescriptors",
[Param("XGL_DESCRIPTOR_SET", "descriptorSet"),
@@ -588,27 +604,27 @@
Param("XGL_DESCRIPTOR_SET", "descriptorSet"),
Param("XGL_UINT", "slotOffset")]),
- Proto("XGL_VOID", "CmdBindDynamicMemoryView",
+ Proto("XGL_VOID", "CmdBindDynamicBufferView",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
- Param("const XGL_MEMORY_VIEW_ATTACH_INFO*", "pMemView")]),
+ Param("const XGL_BUFFER_VIEW_ATTACH_INFO*", "pBufferView")]),
- Proto("XGL_VOID", "CmdBindVertexData",
+ Proto("XGL_VOID", "CmdBindVertexBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_GPU_MEMORY", "mem"),
+ Param("XGL_BUFFER", "buffer"),
Param("XGL_GPU_SIZE", "offset"),
Param("XGL_UINT", "binding")]),
- Proto("XGL_VOID", "CmdBindIndexData",
+ Proto("XGL_VOID", "CmdBindIndexBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_GPU_MEMORY", "mem"),
+ Param("XGL_BUFFER", "buffer"),
Param("XGL_GPU_SIZE", "offset"),
Param("XGL_INDEX_TYPE", "indexType")]),
- Proto("XGL_VOID", "CmdPrepareMemoryRegions",
+ Proto("XGL_VOID", "CmdPrepareBufferRegions",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_UINT", "transitionCount"),
- Param("const XGL_MEMORY_STATE_TRANSITION*", "pStateTransitions")]),
+ Param("const XGL_BUFFER_STATE_TRANSITION*", "pStateTransitions")]),
Proto("XGL_VOID", "CmdPrepareImages",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
@@ -632,14 +648,14 @@
Proto("XGL_VOID", "CmdDrawIndirect",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_GPU_MEMORY", "mem"),
+ Param("XGL_BUFFER", "buffer"),
Param("XGL_GPU_SIZE", "offset"),
Param("XGL_UINT32", "count"),
Param("XGL_UINT32", "stride")]),
Proto("XGL_VOID", "CmdDrawIndexedIndirect",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_GPU_MEMORY", "mem"),
+ Param("XGL_BUFFER", "buffer"),
Param("XGL_GPU_SIZE", "offset"),
Param("XGL_UINT32", "count"),
Param("XGL_UINT32", "stride")]),
@@ -652,15 +668,15 @@
Proto("XGL_VOID", "CmdDispatchIndirect",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_GPU_MEMORY", "mem"),
+ Param("XGL_BUFFER", "buffer"),
Param("XGL_GPU_SIZE", "offset")]),
- Proto("XGL_VOID", "CmdCopyMemory",
+ Proto("XGL_VOID", "CmdCopyBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_GPU_MEMORY", "srcMem"),
- Param("XGL_GPU_MEMORY", "destMem"),
+ Param("XGL_BUFFER", "srcBuffer"),
+ Param("XGL_BUFFER", "destBuffer"),
Param("XGL_UINT", "regionCount"),
- Param("const XGL_MEMORY_COPY*", "pRegions")]),
+ Param("const XGL_BUFFER_COPY*", "pRegions")]),
Proto("XGL_VOID", "CmdCopyImage",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
@@ -669,19 +685,19 @@
Param("XGL_UINT", "regionCount"),
Param("const XGL_IMAGE_COPY*", "pRegions")]),
- Proto("XGL_VOID", "CmdCopyMemoryToImage",
+ Proto("XGL_VOID", "CmdCopyBufferToImage",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_GPU_MEMORY", "srcMem"),
+ Param("XGL_BUFFER", "srcBuffer"),
Param("XGL_IMAGE", "destImage"),
Param("XGL_UINT", "regionCount"),
- Param("const XGL_MEMORY_IMAGE_COPY*", "pRegions")]),
+ Param("const XGL_BUFFER_IMAGE_COPY*", "pRegions")]),
- Proto("XGL_VOID", "CmdCopyImageToMemory",
+ Proto("XGL_VOID", "CmdCopyImageToBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_IMAGE", "srcImage"),
- Param("XGL_GPU_MEMORY", "destMem"),
+ Param("XGL_BUFFER", "destBuffer"),
Param("XGL_UINT", "regionCount"),
- Param("const XGL_MEMORY_IMAGE_COPY*", "pRegions")]),
+ Param("const XGL_BUFFER_IMAGE_COPY*", "pRegions")]),
Proto("XGL_VOID", "CmdCloneImageData",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
@@ -690,16 +706,16 @@
Param("XGL_IMAGE", "destImage"),
Param("XGL_IMAGE_STATE", "destImageState")]),
- Proto("XGL_VOID", "CmdUpdateMemory",
+ Proto("XGL_VOID", "CmdUpdateBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_GPU_MEMORY", "destMem"),
+ Param("XGL_BUFFER", "destBuffer"),
Param("XGL_GPU_SIZE", "destOffset"),
Param("XGL_GPU_SIZE", "dataSize"),
Param("const XGL_UINT32*", "pData")]),
- Proto("XGL_VOID", "CmdFillMemory",
+ Proto("XGL_VOID", "CmdFillBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_GPU_MEMORY", "destMem"),
+ Param("XGL_BUFFER", "destBuffer"),
Param("XGL_GPU_SIZE", "destOffset"),
Param("XGL_GPU_SIZE", "fillSize"),
Param("XGL_UINT32", "data")]),
@@ -741,9 +757,9 @@
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_EVENT", "event")]),
- Proto("XGL_VOID", "CmdMemoryAtomic",
+ Proto("XGL_VOID", "CmdBufferAtomic",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_GPU_MEMORY", "destMem"),
+ Param("XGL_BUFFER", "destBuffer"),
Param("XGL_GPU_SIZE", "destOffset"),
Param("XGL_UINT64", "srcData"),
Param("XGL_ATOMIC_OP", "atomicOp")]),
@@ -768,7 +784,7 @@
Proto("XGL_VOID", "CmdWriteTimestamp",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_TIMESTAMP_TYPE", "timestampType"),
- Param("XGL_GPU_MEMORY", "destMem"),
+ Param("XGL_BUFFER", "destBuffer"),
Param("XGL_GPU_SIZE", "destOffset")]),
Proto("XGL_VOID", "CmdInitAtomicCounters",
@@ -783,7 +799,7 @@
Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
Param("XGL_UINT", "startCounter"),
Param("XGL_UINT", "counterCount"),
- Param("XGL_GPU_MEMORY", "srcMem"),
+ Param("XGL_BUFFER", "srcBuffer"),
Param("XGL_GPU_SIZE", "srcOffset")]),
Proto("XGL_VOID", "CmdSaveAtomicCounters",
@@ -791,7 +807,7 @@
Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
Param("XGL_UINT", "startCounter"),
Param("XGL_UINT", "counterCount"),
- Param("XGL_GPU_MEMORY", "destMem"),
+ Param("XGL_BUFFER", "destBuffer"),
Param("XGL_GPU_SIZE", "destOffset")]),
Proto("XGL_RESULT", "CreateFramebuffer",