commit 9452ac2c92299ce1eeeb79c505f9f5aa62a7025b
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Apr 13 16:16:04 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:33:26 2015 +0800
tree 26fdf4c7106251c036aff8e0013bfb3076731abe
parent 32876a196c06adfec11d4530d017f0c741bae276

FIXUP: Remove PIPELINE_DELTA

commit 57a757fda4f6a62cb1187b015f28119ce9c5a2b2
Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
Date:   Wed Mar 25 15:37:49 2015 -0600

    xgl: Remove PIPELINE_DELTA.

    bug: 13065
    header: 0.60.0

    Remove PIPELINE_DELTA.

    Add functions for creating and loading pipeline derivatives.

tools/glave/scripts/vk_generate.py

diff --git a/tools/glave/scripts/vk_generate.py b/tools/glave/scripts/vk_generate.py
index 04e7948..87daa57 100755
--- a/tools/glave/scripts/vk_generate.py
+++ b/tools/glave/scripts/vk_generate.py
@@ -1591,7 +1591,7 @@
         cgp_body.append('            struct shaderPair saveShader[10];')
         cgp_body.append('            unsigned int idx = 0;')
         cgp_body.append('            memcpy(&createInfo, pPacket->pCreateInfo, sizeof(XGL_GRAPHICS_PIPELINE_CREATE_INFO));')
-        cgp_body.append('            createInfo.lastSetLayout = remap(createInfo.lastSetLayout);')
+        cgp_body.append('            createInfo.lastSetLayout = m_objMapper.remap(createInfo.lastSetLayout);')
         cgp_body.append('            // Cast to shader type, as those are of primariy interest and all structs in LL have same header w/ sType & pNext')
         cgp_body.append('            XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pPacketNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pPacket->pCreateInfo->pNext;')
         cgp_body.append('            XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)createInfo.pNext;')
@@ -1601,16 +1601,16 @@
         cgp_body.append('                {')
         cgp_body.append('                    saveShader[idx].val = pNext->shader.shader;')
         cgp_body.append('                    saveShader[idx++].addr = &(pNext->shader.shader);')
-        cgp_body.append('                    pNext->shader.shader = remap(pPacketNext->shader.shader);')
+        cgp_body.append('                    pNext->shader.shader = m_objMapper.remap(pPacketNext->shader.shader);')
         cgp_body.append('                }')
         cgp_body.append('                pPacketNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pPacketNext->pNext;')
         cgp_body.append('                pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pNext->pNext;')
         cgp_body.append('            }')
         cgp_body.append('            XGL_PIPELINE pipeline;')
-        cgp_body.append('            replayResult = m_xglFuncs.real_xglCreateGraphicsPipelineDerivative(remap(pPacket->device), &createInfo, remap(pPacket->basePipeline), &pipeline);')
+        cgp_body.append('            replayResult = m_xglFuncs.real_xglCreateGraphicsPipelineDerivative(m_objMapper.remap(pPacket->device), &createInfo, m_objMapper.remap(pPacket->basePipeline), &pipeline);')
         cgp_body.append('            if (replayResult == XGL_SUCCESS)')
         cgp_body.append('            {')
-        cgp_body.append('                add_to_map(pPacket->pPipeline, &pipeline);')
+        cgp_body.append('                m_objMapper.add_to_map(pPacket->pPipeline, &pipeline);')
         cgp_body.append('            }')
         cgp_body.append('            for (unsigned int i = 0; i < idx; i++)')
         cgp_body.append('                *(saveShader[i].addr) = saveShader[i].val;')