diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-02-20 10:30:32 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-02-20 10:39:05 -0700 |
| commit | bfbb706390507d2e1c30925fff98b1147680416d (patch) | |
| tree | 7175415c59dca75c15236453527c985194b5e669 | |
| parent | 60c9ce96af8c38fb642bf868970219a3cd755ca1 (diff) | |
| download | usermoji-bfbb706390507d2e1c30925fff98b1147680416d.tar.xz | |
glave: Fix bug in tracing CreateRenderPass with NULL attachments
| -rwxr-xr-x | glave-generate.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/glave-generate.py b/glave-generate.py index d146e0c2..2d3d9ed5 100755 --- a/glave-generate.py +++ b/glave-generate.py @@ -470,8 +470,10 @@ class Subcommand(object): func_body.append(' customSize = colorCount * sizeof(XGL_COLOR_ATTACHMENT_BIND_INFO) + dsSize;') func_body.append(' CREATE_TRACE_PACKET(xglCreateFramebuffer, sizeof(XGL_FRAMEBUFFER_CREATE_INFO) + sizeof(XGL_FRAMEBUFFER) + customSize);') elif 'CreateRenderPass' == proto.name: - func_body.append(' uint32_t colorCount = (pCreateInfo != NULL && pCreateInfo->pColorLoadOps != NULL && pCreateInfo->pColorStoreOps != NULL && pCreateInfo->pColorLoadClearValues != NULL) ? pCreateInfo->colorAttachmentCount : 0;') - func_body.append(' customSize = colorCount * (sizeof(XGL_ATTACHMENT_LOAD_OP) + sizeof(XGL_ATTACHMENT_STORE_OP) + sizeof(XGL_CLEAR_COLOR));') + func_body.append(' uint32_t colorCount = (pCreateInfo != NULL && (pCreateInfo->pColorLoadOps != NULL || pCreateInfo->pColorStoreOps != NULL || pCreateInfo->pColorLoadClearValues != NULL)) ? pCreateInfo->colorAttachmentCount : 0;') + func_body.append(' customSize = colorCount * ((pCreateInfo->pColorLoadOps != NULL) ? sizeof(XGL_ATTACHMENT_LOAD_OP) : 0);') + func_body.append(' customSize += colorCount * ((pCreateInfo->pColorStoreOps != NULL) ? sizeof(XGL_ATTACHMENT_STORE_OP) : 0);') + func_body.append(' customSize += colorCount * ((pCreateInfo->pColorLoadClearValues != NULL) ? sizeof(XGL_CLEAR_COLOR) : 0);') func_body.append(' CREATE_TRACE_PACKET(xglCreateRenderPass, sizeof(XGL_RENDER_PASS_CREATE_INFO) + sizeof(XGL_RENDER_PASS) + customSize);') elif 'BeginCommandBuffer' == proto.name: func_body.append(' customSize = calculate_begin_cmdbuf_size(pBeginInfo->pNext);') |