diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-10-23 13:38:14 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-10-26 16:24:10 -0600 |
| commit | c3ad65e09812788360a97f48a66ede6c8daebe9f (patch) | |
| tree | ba8089c17d50ece15c157e35f49e638bb132b023 /layers/param_checker.cpp | |
| parent | bc17d24f11bb1ae3ec57335d11488be9e51a2eac (diff) | |
| download | usermoji-c3ad65e09812788360a97f48a66ede6c8daebe9f.tar.xz | |
bug-14827: Remove DescriptorInfo union
The DescriptorInfo union is invalid in C++
Diffstat (limited to 'layers/param_checker.cpp')
| -rw-r--r-- | layers/param_checker.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index dc9f8da4..793a4239 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -4783,10 +4783,12 @@ bool PreUpdateDescriptorSets( "vkUpdateDescriptorSets parameter, VkDescriptorType pDescriptorWrites->descriptorType, is an unrecognized enumerator"); return false; } - if(pDescriptorWrites->pDescriptors != nullptr) + /* TODO: Validate other parts of pImageInfo, pBufferInfo, pTexelBufferView? */ + /* TODO: This test should probably only be done if descriptorType is correct type of descriptor */ + if(pDescriptorWrites->pImageInfo != nullptr) { - if(pDescriptorWrites->pDescriptors->imageInfo.imageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || - pDescriptorWrites->pDescriptors->imageInfo.imageLayout > VK_IMAGE_LAYOUT_END_RANGE) + if(pDescriptorWrites->pImageInfo->imageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || + pDescriptorWrites->pImageInfo->imageLayout > VK_IMAGE_LAYOUT_END_RANGE) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkUpdateDescriptorSets parameter, VkImageLayout pDescriptorWrites->pDescriptors->imageLayout, is an unrecognized enumerator"); |