From ef04e9842daee1af7626c347a8da0e3fbbe3c5c6 Mon Sep 17 00:00:00 2001 From: Jarred Davies Date: Fri, 29 Jun 2018 11:19:54 +0100 Subject: [PATCH] Don't set an object name for the wireframe pipeline when fillModeNonSolid is not supported Fixes segfault in debugmarker example on platforms where fillModeNonSolid is not supported --- examples/debugmarker/debugmarker.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/debugmarker/debugmarker.cpp b/examples/debugmarker/debugmarker.cpp index 0ec1cdb5..c79e84c3 100644 --- a/examples/debugmarker/debugmarker.cpp +++ b/examples/debugmarker/debugmarker.cpp @@ -864,7 +864,12 @@ public: // Name pipelines for debugging DebugMarker::setObjectName(device, (uint64_t)pipelines.toonshading, VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT, "Toon shading pipeline"); DebugMarker::setObjectName(device, (uint64_t)pipelines.color, VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT, "Color only pipeline"); - DebugMarker::setObjectName(device, (uint64_t)pipelines.wireframe, VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT, "Wireframe rendering pipeline"); + + if (deviceFeatures.fillModeNonSolid) + { + DebugMarker::setObjectName(device, (uint64_t)pipelines.wireframe, VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT, "Wireframe rendering pipeline"); + } + DebugMarker::setObjectName(device, (uint64_t)pipelines.postprocess, VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT, "Post processing pipeline"); }