Skip to content
Snippets Groups Projects
Commit f335010a authored by Sebastian Gaida's avatar Sebastian Gaida
Browse files

[#89] cherrypick 6a1f9a5e & 2934d8bf form #71

parent dac6c72d
No related branches found
No related tags found
1 merge request!90Resolve "Mehrere Fenster, Abhängigkeiten von Core zu Fenster+Swapchain etc"
Pipeline #27001 passed
...@@ -458,7 +458,7 @@ namespace vkcv ...@@ -458,7 +458,7 @@ namespace vkcv
color color
); );
beginDebugLabel(cmdBuffer, &(static_cast<const VkDebugUtilsLabelEXT&>(debug))); beginDebugLabel(static_cast<VkCommandBuffer>(cmdBuffer), &(static_cast<const VkDebugUtilsLabelEXT&>(debug)));
}; };
recordCommandsToStream(cmdStream, submitFunction, nullptr); recordCommandsToStream(cmdStream, submitFunction, nullptr);
...@@ -476,7 +476,7 @@ namespace vkcv ...@@ -476,7 +476,7 @@ namespace vkcv
} }
auto submitFunction = [&](const vk::CommandBuffer& cmdBuffer) { auto submitFunction = [&](const vk::CommandBuffer& cmdBuffer) {
endDebugLabel(cmdBuffer); endDebugLabel(static_cast<VkCommandBuffer>(cmdBuffer));
}; };
recordCommandsToStream(cmdStream, submitFunction, nullptr); recordCommandsToStream(cmdStream, submitFunction, nullptr);
...@@ -874,7 +874,7 @@ namespace vkcv ...@@ -874,7 +874,7 @@ namespace vkcv
label.c_str() label.c_str()
); );
setDebugLabel(device, &(static_cast<const VkDebugUtilsObjectNameInfoEXT&>(debug))); setDebugLabel(static_cast<VkDevice>(device), &(static_cast<const VkDebugUtilsObjectNameInfoEXT&>(debug)));
#endif #endif
} }
...@@ -887,7 +887,7 @@ namespace vkcv ...@@ -887,7 +887,7 @@ namespace vkcv
setDebugObjectLabel( setDebugObjectLabel(
m_Context.getDevice(), m_Context.getDevice(),
vk::ObjectType::eBuffer, vk::ObjectType::eBuffer,
reinterpret_cast<uint64_t>(static_cast<VkBuffer>( uint64_t(static_cast<VkBuffer>(
m_BufferManager->getBuffer(handle) m_BufferManager->getBuffer(handle)
)), )),
label label
...@@ -903,7 +903,7 @@ namespace vkcv ...@@ -903,7 +903,7 @@ namespace vkcv
setDebugObjectLabel( setDebugObjectLabel(
m_Context.getDevice(), m_Context.getDevice(),
vk::ObjectType::eRenderPass, vk::ObjectType::eRenderPass,
reinterpret_cast<uint64_t>(static_cast<VkRenderPass>( uint64_t(static_cast<VkRenderPass>(
m_PassManager->getVkPass(handle) m_PassManager->getVkPass(handle)
)), )),
label label
...@@ -919,7 +919,7 @@ namespace vkcv ...@@ -919,7 +919,7 @@ namespace vkcv
setDebugObjectLabel( setDebugObjectLabel(
m_Context.getDevice(), m_Context.getDevice(),
vk::ObjectType::ePipeline, vk::ObjectType::ePipeline,
reinterpret_cast<uint64_t>(static_cast<VkPipeline>( uint64_t(static_cast<VkPipeline>(
m_PipelineManager->getVkPipeline(handle) m_PipelineManager->getVkPipeline(handle)
)), )),
label label
...@@ -935,7 +935,7 @@ namespace vkcv ...@@ -935,7 +935,7 @@ namespace vkcv
setDebugObjectLabel( setDebugObjectLabel(
m_Context.getDevice(), m_Context.getDevice(),
vk::ObjectType::eDescriptorSet, vk::ObjectType::eDescriptorSet,
reinterpret_cast<uint64_t>(static_cast<VkDescriptorSet>( uint64_t(static_cast<VkDescriptorSet>(
m_DescriptorManager->getDescriptorSet(handle).vulkanHandle m_DescriptorManager->getDescriptorSet(handle).vulkanHandle
)), )),
label label
...@@ -951,7 +951,7 @@ namespace vkcv ...@@ -951,7 +951,7 @@ namespace vkcv
setDebugObjectLabel( setDebugObjectLabel(
m_Context.getDevice(), m_Context.getDevice(),
vk::ObjectType::eSampler, vk::ObjectType::eSampler,
reinterpret_cast<uint64_t>(static_cast<VkSampler>( uint64_t(static_cast<VkSampler>(
m_SamplerManager->getVulkanSampler(handle) m_SamplerManager->getVulkanSampler(handle)
)), )),
label label
...@@ -971,7 +971,7 @@ namespace vkcv ...@@ -971,7 +971,7 @@ namespace vkcv
setDebugObjectLabel( setDebugObjectLabel(
m_Context.getDevice(), m_Context.getDevice(),
vk::ObjectType::eImage, vk::ObjectType::eImage,
reinterpret_cast<uint64_t>(static_cast<VkImage>( uint64_t(static_cast<VkImage>(
m_ImageManager->getVulkanImage(handle) m_ImageManager->getVulkanImage(handle)
)), )),
label label
...@@ -987,7 +987,7 @@ namespace vkcv ...@@ -987,7 +987,7 @@ namespace vkcv
setDebugObjectLabel( setDebugObjectLabel(
m_Context.getDevice(), m_Context.getDevice(),
vk::ObjectType::eCommandBuffer, vk::ObjectType::eCommandBuffer,
reinterpret_cast<uint64_t>(static_cast<VkCommandBuffer>( uint64_t(static_cast<VkCommandBuffer>(
m_CommandStreamManager->getStreamCommandBuffer(handle) m_CommandStreamManager->getStreamCommandBuffer(handle)
)), )),
label label
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment