diff options
| author | Tobin Ehlis <tobine@google.com> | 2016-02-10 18:36:15 -0500 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-02-10 18:36:15 -0500 |
| commit | bbff8b15138c770a75ecccd7e8d6d9799dcd52cc (patch) | |
| tree | 4debb78a96230689fdf839c07db506bc02ca4eef | |
| parent | a40bc60e012a99a30ac13f42294c4dfb9d148d78 (diff) | |
| parent | 276290f5eb44849a13ca386c6de55aeaeb32f3df (diff) | |
| download | usermoji-bbff8b15138c770a75ecccd7e8d6d9799dcd52cc.tar.xz | |
Merge branch 'stroyan_draw_state_beginCB' into 'master'
layers: draw_state allow pInheritanceInfo NULL
The pInheritanceInfo field in VkCommandBufferBeginInfo may be NULL.
Test for that before using it in draw_state layer.
See merge request !229
| -rw-r--r-- | layers/draw_state.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index f69168e1..4c8823ce 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -4575,7 +4575,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkBeginCommandBuffer(VkCommandBuf "support precise occlusion queries.", reinterpret_cast<void*>(commandBuffer)); } } - if (pInfo->renderPass != VK_NULL_HANDLE) { + if (pInfo && pInfo->renderPass != VK_NULL_HANDLE) { auto rp_data = dev_data->renderPassMap.find(pInfo->renderPass); if (rp_data != dev_data->renderPassMap.end() && rp_data->second && rp_data->second->pCreateInfo) { if (pInfo->subpass >= rp_data->second->pCreateInfo->subpassCount) { |