lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-08 16:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove VkAttachmentBindInfo

Browse Source
This commit is contained in:
baldurk
2015-10-09 16:28:56 +02:00
parent f67ad0e14a
commit 070db79410
5 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_common.cpp
+11 -10
View File
@@ -2208,15 +2208,6 @@ void Serialiser::Serialise(const char *name, VkImageViewCreateInfo &el)
Serialise("subresourceRange", el.subresourceRange);
}
template<>
void Serialiser::Serialise(const char *name, VkAttachmentBindInfo &el)
{
ScopedContext scope(this, name, "VkAttachmentBindInfo", 0, true);
SerialiseObject(VkAttachmentView, "view", el.view);
Serialise("layout", el.layout);
}
template<>
void Serialiser::Serialise(const char *name, VkFramebufferCreateInfo &el)
{
@@ -2227,10 +2218,20 @@ void Serialiser::Serialise(const char *name, VkFramebufferCreateInfo &el)
SerialiseNext(this, el.pNext);
SerialiseObject(VkRenderPass, "renderPass", el.renderPass);
SerialiseComplexArray("pAttachments", (VkAttachmentBindInfo *&)el.pAttachments, el.attachmentCount);
Serialise("width", el.width);
Serialise("height", el.height);
Serialise("layers", el.layers);
// do this one by hand because it's an array of objects that aren't Serialise
// overloaded
Serialise("attachmentCount", el.attachmentCount);
if(m_Mode == READING)
el.pAttachments = el.attachmentCount ? new VkImageView[el.attachmentCount] : NULL;
VkImageView *attaches = (VkImageView *)el.pAttachments;
for(uint32_t i=0; i < el.attachmentCount; i++)
SerialiseObject(VkImageView, "pAttachments", attaches[i]);
}
template<>
renderdoc/driver/vulkan/vk_common.h
-1
View File
@@ -84,7 +84,6 @@ template<> void Serialiser::Serialise(const char *name, VkBufferCreateInfo &el);
template<> void Serialiser::Serialise(const char *name, VkBufferViewCreateInfo &el);
template<> void Serialiser::Serialise(const char *name, VkImageCreateInfo &el);
template<> void Serialiser::Serialise(const char *name, VkImageViewCreateInfo &el);
template<> void Serialiser::Serialise(const char *name, VkAttachmentBindInfo &el);
template<> void Serialiser::Serialise(const char *name, VkFramebufferCreateInfo &el);
template<> void Serialiser::Serialise(const char *name, VkRenderPassCreateInfo &el);
template<> void Serialiser::Serialise(const char *name, VkRenderPassBeginInfo &el);
renderdoc/driver/vulkan/vk_replay.cpp
+1 -3
View File
@@ -382,12 +382,10 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device,
VKMGR()->WrapResource(Unwrap(device), bbview);
VkAttachmentBindInfo attBind = { Unwrap(bbview), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
VkFramebufferCreateInfo fbinfo = {
VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, NULL,
Unwrap(renderpass),
1, &attBind,
1, UnwrapPtr(bbview),
(uint32_t)width, (uint32_t)height, 1,
};
renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+2 -5
View File
@@ -516,12 +516,9 @@ VkResult WrappedVulkan::vkCreateFramebuffer(
const VkFramebufferCreateInfo* pCreateInfo,
VkFramebuffer* pFramebuffer)
{
VkAttachmentBindInfo *unwrapped = GetTempArray<VkAttachmentBindInfo>(pCreateInfo->attachmentCount);
VkImageView *unwrapped = GetTempArray<VkImageView>(pCreateInfo->attachmentCount);
for(uint32_t i=0; i < pCreateInfo->attachmentCount; i++)
{
unwrapped[i] = pCreateInfo->pAttachments[i];
unwrapped[i].view = Unwrap(unwrapped[i].view);
}
unwrapped[i] = Unwrap(pCreateInfo->pAttachments[i]);
VkFramebufferCreateInfo unwrappedInfo = *pCreateInfo;
unwrappedInfo.renderPass = Unwrap(unwrappedInfo.renderPass);
renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp
+1 -3
View File
@@ -440,12 +440,10 @@ VkResult WrappedVulkan::vkCreateSwapChainWSI(
GetResourceManager()->WrapResource(Unwrap(device), swapImInfo.view);
VkAttachmentBindInfo attBind = { Unwrap(swapImInfo.view), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
VkFramebufferCreateInfo fbinfo = {
VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, NULL,
Unwrap(swapInfo.rp),
1, &attBind,
1, UnwrapPtr(swapImInfo.view),
(uint32_t)pCreateInfo->imageExtent.width, (uint32_t)pCreateInfo->imageExtent.height, 1,
};