commit aa86e0e5e5838279bcc0415bef887292d7d42383
author Courtney Goeltzenleuchter <courtney@LunarG.com> Tue Mar 24 18:02:34 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:33:25 2015 +0800
tree c167b70c9836290100878abeac0b9a43230f3565
parent 9949dfe4b291e210198aea7497b91e6c58b469c7

xgl: Add XGL_PIPE_EVENT to CmdResetEvent

part 3 of bug #12904
alpha header: r29684 (0.59.0)

(3) Where does xglCmdResetEvent update the event's status? Unlike xglCmdSetEvent this function doesn't take a parameter specifying this.

- Added pipeEvent parameter also to xglCmdResetEvent. Also renamed XGL_SET_EVENT to XGL_PIPE_EVENT as now it's no longer used only for set operations.

tools/glave/scripts/vk_generate.py

diff --git a/tools/glave/scripts/vk_generate.py b/tools/glave/scripts/vk_generate.py
index 6219799..c0de231 100755
--- a/tools/glave/scripts/vk_generate.py
+++ b/tools/glave/scripts/vk_generate.py
@@ -844,7 +844,7 @@
                                                                           '    *ppLocalMemBarriers = (void*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pInfo->ppMemBarriers[i]);\n',
                                                                           '}']},
                              'CmdPipelineBarrier' : {'param': 'pBarrier', 'txt': ['XGL_PIPELINE_BARRIER* pBarrier = (XGL_PIPELINE_BARRIER*)pPacket->pBarrier;\n',
-                                                                          'pBarrier->pEvents = (XGL_SET_EVENT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBarrier->pEvents);\n',
+                                                                          'pBarrier->pEvents = (XGL_PIPE_EVENT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBarrier->pEvents);\n',
                                                                           'pBarrier->ppMemBarriers = (const void**) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBarrier->ppMemBarriers);\n',
                                                                           'uint32_t i;\n',
                                                                           'for (i = 0; i < pBarrier->memBarrierCount; i++) {\n',
@@ -1558,9 +1558,9 @@
         cbrp_body = []
         cbrp_body.append('            XGL_RENDER_PASS_BEGIN savedRPB, *pRPB = (XGL_RENDER_PASS_BEGIN *) pPacket->pRenderPassBegin;')
         cbrp_body.append('            savedRPB = *(pPacket->pRenderPassBegin);')
-        cbrp_body.append('            pRPB->renderPass = remap(savedRPB.renderPass);')
-        cbrp_body.append('            pRPB->framebuffer = remap(savedRPB.framebuffer);')
-        cbrp_body.append('            m_xglFuncs.real_xglCmdBeginRenderPass(remap(pPacket->cmdBuffer), pPacket->pRenderPassBegin);')
+        cbrp_body.append('            pRPB->renderPass = m_objMapper.remap(savedRPB.renderPass);')
+        cbrp_body.append('            pRPB->framebuffer = m_objMapper.remap(savedRPB.framebuffer);')
+        cbrp_body.append('            m_xglFuncs.real_xglCmdBeginRenderPass(m_objMapper.remap(pPacket->cmdBuffer), pPacket->pRenderPassBegin);')
         cbrp_body.append('            *pRPB = savedRPB;')
         return "\n".join(cbrp_body)