lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-28 04:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix in-application text rendering

Browse Source
This commit is contained in:
baldurk
2015-09-19 17:41:41 +02:00
parent 6a904ba032
commit 98bfdd82db
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.cpp
+2 -2
View File
@@ -7023,11 +7023,11 @@ VkResult WrappedVulkan::vkCreateSwapChainWSI(
GetResourceManager()->WrapResource(Unwrap(device), swapImInfo.view);
VkAttachmentBindInfo attBind = { swapImInfo.view, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
VkAttachmentBindInfo attBind = { Unwrap(swapImInfo.view), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
VkFramebufferCreateInfo fbinfo = {
VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, NULL,
swapInfo.rp,
Unwrap(swapInfo.rp),
1, &attBind,
(uint32_t)pCreateInfo->imageExtent.width, (uint32_t)pCreateInfo->imageExtent.height, 1,
};
renderdoc/driver/vulkan/vk_debug.cpp
+1 -2
View File
@@ -941,7 +941,7 @@ void VulkanDebugManager::RenderText(const TextPrintState &textstate, float x, fl
void VulkanDebugManager::RenderTextInternal(const TextPrintState &textstate, float x, float y, const char *text)
{
const VkLayerDispatchTable *vt = ObjDisp(m_Device);
const VkLayerDispatchTable *vt = ObjDisp(textstate.cmd);
// VKTODOMED needs to be optimised to do all in one cmd buffer with
// a start/stop pair of calls that map a UBO, then do each draw with
@@ -989,7 +989,6 @@ void VulkanDebugManager::RenderTextInternal(const TextPrintState &textstate, flo
};
vt->CmdBeginRenderPass(Unwrap(textstate.cmd), &rpbegin, VK_RENDER_PASS_CONTENTS_INLINE);
// VKTODOMED will need a way to disable blend for other things
vt->CmdBindPipeline(Unwrap(textstate.cmd), VK_PIPELINE_BIND_POINT_GRAPHICS, Unwrap(m_TextPipeline));
vt->CmdBindDescriptorSets(Unwrap(textstate.cmd), VK_PIPELINE_BIND_POINT_GRAPHICS, Unwrap(m_TextPipeLayout), 0, 1, UnwrapPtr(m_TextDescSet), 0, NULL);