From 7cd389c11c9d1097fb04ba44b3f1d213c98ebc99 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Mon, 7 Mar 2016 16:11:47 -0700 Subject: layers: GHLVL88, Fix ValidateBarriers in draw_state Apps using QUEUE_FAMILY_IGNORED might get bad validation errors. Change-Id: I3c8b3723701b8b24e2e9cd81a20f7192bcef15a7 --- layers/draw_state.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index ea6b9e8d..8925496d 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -6620,10 +6620,12 @@ VkBool32 ValidateBarriers(const char* funcName, "dstQueueFamilyIndex is VK_QUEUE_FAMILY_IGNORED, both " "must be.", funcName, reinterpret_cast(mem_barrier->image)); - } else if (((src_q_f_index >= - dev_data->physDevProperties.queue_family_properties.size()) || + } else if (((src_q_f_index != VK_QUEUE_FAMILY_IGNORED) && + (dst_q_f_index != VK_QUEUE_FAMILY_IGNORED)) && + ((src_q_f_index >= + dev_data->physDevProperties.queue_family_properties.size()) || (dst_q_f_index >= - dev_data->physDevProperties.queue_family_properties.size()))) { + dev_data->physDevProperties.queue_family_properties.size()))) { skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, (VkDebugReportObjectTypeEXT)0, 0, __LINE__, -- cgit v1.2.3