diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-02-09 12:56:10 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-02-11 15:30:18 -0700 |
| commit | 2a0db9f79811c2038c5ec0bd4dc23e54f1864f63 (patch) | |
| tree | 21a3f5965f440064ca72b81406258667dbe7cade | |
| parent | 6e671d09a9af1e3f74f82aa928fefe33b1010478 (diff) | |
| download | usermoji-2a0db9f79811c2038c5ec0bd4dc23e54f1864f63.tar.xz | |
glave: Fix interpretation of allocMemory and beginCommandBuffer trace packets
| -rwxr-xr-x | glave-generate.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/glave-generate.py b/glave-generate.py index 8d8a680a..ea0e40d5 100755 --- a/glave-generate.py +++ b/glave-generate.py @@ -1531,15 +1531,15 @@ class Subcommand(object): '}']}, 'BeginCommandBuffer' : {'param': 'pBeginInfo', 'txt': ['assert(pPacket->pBeginInfo->sType == XGL_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO);\n', '// need to make a non-const pointer to the pointer so that we can properly change the original pointer to the interpretted one\n', - 'void** ppNextVoidPtr = (void**)&(pPacket->pBeginInfo->pNext);\n', - '*ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBeginInfo->pNext);\n', - 'XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO* pNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO*)pPacket->pBeginInfo->pNext;\n', + 'XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO** ppNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO**)&(pPacket->pBeginInfo->pNext);\n', + '*ppNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBeginInfo->pNext);\n', + 'XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO* pNext = *ppNext;\n', 'while (NULL != pNext)\n', '{\n', ' switch(pNext->sType)\n', ' {\n', ' case XGL_STRUCTURE_TYPE_CMD_BUFFER_GRAPHICS_BEGIN_INFO:\n', ' {\n', - ' void** ppNextVoidPtr = (void**)&pNext->pNext;\n', - ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n', + ' ppNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO**) &pNext->pNext;\n', + ' *ppNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n', ' break;\n', ' }\n', ' default:\n', @@ -1548,11 +1548,10 @@ class Subcommand(object): ' pNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO*)pNext->pNext;\n', '}']}, 'AllocMemory' : {'param': 'pAllocInfo', 'txt': ['assert(pPacket->pAllocInfo->sType == XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO);\n', - 'XGL_MEMORY_ALLOC_INFO* pNext = (XGL_MEMORY_ALLOC_INFO*) pPacket->pAllocInfo->pNext;\n', 'XGL_MEMORY_ALLOC_INFO** ppNext = (XGL_MEMORY_ALLOC_INFO**) &(pPacket->pAllocInfo->pNext);\n', + '*ppNext = (XGL_MEMORY_ALLOC_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pAllocInfo->pNext);\n', + 'XGL_MEMORY_ALLOC_INFO* pNext = (XGL_MEMORY_ALLOC_INFO*) *ppNext;\n', 'while (NULL != pNext)\n', '{\n', - ' *ppNext = (XGL_MEMORY_ALLOC_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext);\n', - ' pNext = *ppNext;\n', ' switch(pNext->sType)\n', ' {\n', ' case XGL_STRUCTURE_TYPE_MEMORY_ALLOC_BUFFER_INFO:\n', ' case XGL_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO:\n', |