diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-10-26 17:32:47 +0800 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-11-02 14:17:21 -0700 |
| commit | 6555f3f867ff897affd8eeb892dc445b4e9ac5f7 (patch) | |
| tree | 608c3b766b5ce25cb0583383ace9edfa6df1b31d /layers/image.cpp | |
| parent | fbb7a1c331cc86f44f6505bc7d65ca8910a6b8c3 (diff) | |
| download | usermoji-6555f3f867ff897affd8eeb892dc445b4e9ac5f7.tar.xz | |
MR 542: Remaining items from the cleanup bug (WIP)
depthStencilAttachment is replaced by pDepthStencilAttachment.
s/VK_CULL_MODE_FRONT\b/VK_CULL_MODE_FRONT_BIT/g
s/VK_CULL_MODE_BACK\b/VK_CULL_MODE_BACK_BIT/g
s/VK_SAMPLER_ADDRESS_MODE_WRAP\b/VK_SAMPLER_ADDRESS_MODE_REPEAT/g
s/VK_SAMPLER_ADDRESS_MODE_MIRROR\b/VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT/g
s/VK_SAMPLER_ADDRESS_MODE_CLAMP\b/VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE/g
s/VK_SAMPLER_ADDRESS_MODE_MIRROR_ONCE\b/VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE/g
s/VK_SAMPLER_ADDRESS_MODE_CLAMP_BORDER\b/VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER/g
https://gitlab.khronos.org/vulkan/vulkan/merge_requests/542
Diffstat (limited to 'layers/image.cpp')
| -rw-r--r-- | layers/image.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/layers/image.cpp b/layers/image.cpp index af8bef49..b9d49b32 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -336,7 +336,8 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRende if (depthFormatPresent == VK_FALSE) { // No depth attachment is present, validate that subpasses set depthStencilAttachment to VK_ATTACHMENT_UNUSED; for (uint32_t i = 0; i < pCreateInfo->subpassCount; i++) { - if (pCreateInfo->pSubpasses[i].depthStencilAttachment.attachment != VK_ATTACHMENT_UNUSED) { + if (pCreateInfo->pSubpasses[i].pDepthStencilAttachment && + pCreateInfo->pSubpasses[i].pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) { std::stringstream ss; ss << "vkCreateRenderPass has no depth/stencil attachment, yet subpass[" << i << "] has VkSubpassDescription::depthStencilAttachment value that is not VK_ATTACHMENT_UNUSED"; skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, IMAGE_RENDERPASS_INVALID_DS_ATTACHMENT, "IMAGE", ss.str().c_str()); |