diff --git a/examples/app/vsgviewer/vsgviewer.cpp b/examples/app/vsgviewer/vsgviewer.cpp index f68caab0..6861e988 100644 --- a/examples/app/vsgviewer/vsgviewer.cpp +++ b/examples/app/vsgviewer/vsgviewer.cpp @@ -71,6 +71,7 @@ int main(int argc, char** argv) windowTraits->debugLayer = arguments.read({"--debug", "-d"}); windowTraits->apiDumpLayer = arguments.read({"--api", "-a"}); windowTraits->synchronizationLayer = arguments.read("--sync"); + windowTraits->debugUtils = arguments.read("--debug-utils"); bool reportAverageFrameRate = arguments.read("--fps"); if (arguments.read("--double-buffer")) windowTraits->swapchainPreferences.imageCount = 2; if (arguments.read("--triple-buffer")) windowTraits->swapchainPreferences.imageCount = 3; // default diff --git a/examples/utils/vsgshaderset/flat.cpp b/examples/utils/vsgshaderset/flat.cpp index 8fa05a82..0d905312 100644 --- a/examples/utils/vsgshaderset/flat.cpp +++ b/examples/utils/vsgshaderset/flat.cpp @@ -29,7 +29,9 @@ vsg::ref_ptr flat_ShaderSet(vsg::ref_ptr opt vsg::info("Local flat_ShaderSet(", options, ")"); auto vertexShader = vsg::read_cast("shaders/standard.vert", options); + vertexShader->module->setValue("DebugUtilsName", "VSG built-in standard.vert"); auto fragmentShader = vsg::read_cast("shaders/standard_flat_shaded.frag", options); + fragmentShader->module->setValue("DebugUtilsName", "VSG built-in standard_flat_shaded.frag"); if (!vertexShader || !fragmentShader) { @@ -78,5 +80,7 @@ vsg::ref_ptr flat_ShaderSet(vsg::ref_ptr opt shaderSet->customDescriptorSetBindings.push_back(vsg::ViewDependentStateBinding::create(VIEW_DESCRIPTOR_SET)); + shaderSet->setValue("DebugUtilsName", "VSG built-in flat ShaderSet"); + return shaderSet; } diff --git a/examples/utils/vsgshaderset/pbr.cpp b/examples/utils/vsgshaderset/pbr.cpp index 1c6acd2b..6e8c10e4 100644 --- a/examples/utils/vsgshaderset/pbr.cpp +++ b/examples/utils/vsgshaderset/pbr.cpp @@ -23,7 +23,9 @@ vsg::ref_ptr pbr_ShaderSet(vsg::ref_ptr opti vsg::info("Local pbr_ShaderSet(", options, ")"); auto vertexShader = vsg::read_cast("shaders/standard.vert", options); + vertexShader->module->setValue("DebugUtilsName", "VSG built-in standard.vert"); auto fragmentShader = vsg::read_cast("shaders/standard_pbr.frag", options); + fragmentShader->module->setValue("DebugUtilsName", "VSG built-in standard_pbr.frag"); if (!vertexShader || !fragmentShader) { @@ -80,5 +82,7 @@ vsg::ref_ptr pbr_ShaderSet(vsg::ref_ptr opti shaderSet->customDescriptorSetBindings.push_back(vsg::ViewDependentStateBinding::create(VIEW_DESCRIPTOR_SET)); + shaderSet->setValue("DebugUtilsName", "VSG built-in PBR ShaderSet"); + return shaderSet; } diff --git a/examples/utils/vsgshaderset/phong.cpp b/examples/utils/vsgshaderset/phong.cpp index 11b0d0a6..f8b40adc 100644 --- a/examples/utils/vsgshaderset/phong.cpp +++ b/examples/utils/vsgshaderset/phong.cpp @@ -22,7 +22,9 @@ vsg::ref_ptr phong_ShaderSet(vsg::ref_ptr op vsg::info("Local phong_ShaderSet(", options, ")"); auto vertexShader = vsg::read_cast("shaders/standard.vert", options); + vertexShader->module->setValue("DebugUtilsName", "VSG built-in standard.vert"); auto fragmentShader = vsg::read_cast("shaders/standard_phong.frag", options); + fragmentShader->module->setValue("DebugUtilsName", "VSG built-in standard_phong.frag"); if (!vertexShader || !fragmentShader) { @@ -76,5 +78,7 @@ vsg::ref_ptr phong_ShaderSet(vsg::ref_ptr op shaderSet->customDescriptorSetBindings.push_back(vsg::ViewDependentStateBinding::create(VIEW_DESCRIPTOR_SET)); + shaderSet->setValue("DebugUtilsName", "VSG built-in Phong ShaderSet"); + return shaderSet; } diff --git a/examples/utils/vsgshaderset/text.cpp b/examples/utils/vsgshaderset/text.cpp index a5f91dd9..2882232b 100644 --- a/examples/utils/vsgshaderset/text.cpp +++ b/examples/utils/vsgshaderset/text.cpp @@ -30,7 +30,9 @@ vsg::ref_ptr text_ShaderSet(vsg::ref_ptr opt // load shaders auto vertexShader = vsg::read_cast("shaders/text.vert", options); + vertexShader->module->setValue("DebugUtilsName", "VSG built-in text.vert"); auto fragmentShader = vsg::read_cast("shaders/text.frag", options); + fragmentShader->module->setValue("DebugUtilsName", "VSG built-in text.frag"); if (!vertexShader || !fragmentShader) { @@ -83,5 +85,7 @@ vsg::ref_ptr text_ShaderSet(vsg::ref_ptr opt auto colorBlendState = vsg::ColorBlendState::create(vsg::ColorBlendState::ColorBlendAttachments{colorBlendAttachment}); shaderSet->defaultGraphicsPipelineStates.push_back(colorBlendState); + shaderSet->setValue("DebugUtilsName", "VSG built-in text ShaderSet"); + return shaderSet; }