entry_names_size += e.name.size()+1;
StructureBuilder sb(creation_info, 5);
- VkPipelineShaderStageCreateInfo *&stage_infos = sb.add<VkPipelineShaderStageCreateInfo>(n_stages);
- char *&name_table = sb.add<char>(entry_names_size);
- VkSpecializationInfo *&spec_info = sb.add<VkSpecializationInfo>();
- VkSpecializationMapEntry *&spec_map = sb.add<VkSpecializationMapEntry>(spec_values.size());
- int *&spec_data = sb.add<int>(spec_values.size());
+ VkPipelineShaderStageCreateInfo *const &stage_infos = sb.add<VkPipelineShaderStageCreateInfo>(n_stages);
+ char *const &name_table = sb.add<char>(entry_names_size);
+ VkSpecializationInfo *const &spec_info = sb.add<VkSpecializationInfo>();
+ VkSpecializationMapEntry *const &spec_map = sb.add<VkSpecializationMapEntry>(spec_values.size());
+ int *const &spec_data = sb.add<int>(spec_values.size());
unsigned i = 0;
for(const SpirVModule::Constant &c: mod.get_spec_constants())
{
bindings.emplace_back();
VkDescriptorSetLayoutBinding &binding = bindings.back();
- binding.binding = b.bind_point;
+ binding.binding = b.bind_point&0xFFFFF;
binding.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
binding.descriptorCount = 1;
- binding.stageFlags = VK_SHADER_STAGE_ALL;
+ binding.stageFlags = stage_flags;
binding.pImmutableSamplers = 0;
}
{
bindings.emplace_back();
VkDescriptorSetLayoutBinding &binding = bindings.back();
- binding.binding = u.binding;
+ binding.binding = u.binding&0xFFFFF;
binding.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
binding.descriptorCount = 1;
- binding.stageFlags = VK_SHADER_STAGE_ALL;
+ binding.stageFlags = stage_flags;
binding.pImmutableSamplers = 0;
}
layout_info.pPushConstantRanges = &push_const_range;
vk.CreatePipelineLayout(layout_info, layout_handle);
+
+#if DEBUG
+ if(!debug_name.empty())
+ set_vulkan_object_name();
+#endif
}
void VulkanProgram::set_debug_name(const string &name)
{
#ifdef DEBUG
debug_name = name;
+ set_vulkan_object_name();
if(SpirVModule *spirv = static_cast<Program *>(this)->specialized_spirv)
spirv->set_debug_name(debug_name);
#else
#endif
}
+void VulkanProgram::set_vulkan_object_name() const
+{
+#ifdef DEBUG
+ const VulkanFunctions &vk = device.get_functions();
+
+ string layout_name = debug_name+" [layout]";
+
+ VkDebugUtilsObjectNameInfoEXT name_info = { };
+ name_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
+ name_info.objectType = VK_OBJECT_TYPE_PIPELINE_LAYOUT;
+ name_info.objectHandle = reinterpret_cast<uint64_t>(layout_handle);
+ name_info.pObjectName = layout_name.c_str();
+ vk.SetDebugUtilsObjectName(name_info);
+
+ name_info.objectType = VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT;
+ for(unsigned i=0; i<desc_set_layout_handles.size(); ++i)
+ {
+ layout_name = format("%s [layout:%d]", debug_name, i);
+ name_info.objectHandle = reinterpret_cast<uint64_t>(desc_set_layout_handles[i]);
+ name_info.pObjectName = layout_name.c_str();
+ vk.SetDebugUtilsObjectName(name_info);
+ }
+#endif
+}
+
} // namespace GL
} // namespace Msp