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

Return backbuffer format and use it to switch BGRA/RGBA where needed

Browse Source
This commit is contained in:
baldurk
2016-02-07 18:39:08 +01:00
parent 98fa972265
commit 77a48f6d07
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.cpp
+1
View File
@@ -6913,6 +6913,7 @@ void WrappedVulkan::ProcessChunk(uint64_t offset, VulkanChunkType context)
m_FakeBBImgId = bbid;
m_FakeBBIm = (VkImage)GetResourceManager()->GetLiveResource(bbid).handle;
m_FakeBBExtent = m_ImageInfo[liveBBid].extent;
m_FakeBBFmt = MakeResourceFormat(m_ImageInfo[liveBBid].format);
bool HasCallstack = false;
m_pSerialiser->Serialise("HasCallstack", HasCallstack);
renderdoc/driver/vulkan/vk_core.h
+3 -2
View File
@@ -163,8 +163,9 @@ private:
ResourceId m_FakeBBImgId;
VkImage m_FakeBBIm;
VkExtent3D m_FakeBBExtent;
void GetFakeBB(ResourceId &id, VkImage &im, VkExtent3D &extent)
{ id = m_FakeBBImgId; im = m_FakeBBIm; extent = m_FakeBBExtent; }
ResourceFormat m_FakeBBFmt;
void GetFakeBB(ResourceId &id, VkImage &im, VkExtent3D &extent, ResourceFormat &fmt)
{ id = m_FakeBBImgId; im = m_FakeBBIm; extent = m_FakeBBExtent; fmt = m_FakeBBFmt; }
map<ResourceId, MemState> m_MemoryInfo;
map<ResourceId, ImgState> m_ImageInfo;
renderdoc/driver/vulkan/vk_replay.cpp
+29 -20
View File
@@ -357,7 +357,8 @@ void VulkanReplay::InitDebugData()
ResourceId id;
VkImage fakeBBIm = VK_NULL_HANDLE;
VkExtent3D fakeBBext;
m_pDriver->GetFakeBB(id, fakeBBIm, fakeBBext);
ResourceFormat fakeBBfmt;
m_pDriver->GetFakeBB(id, fakeBBIm, fakeBBext, fakeBBfmt);
VkImageViewCreateInfo bbviewInfo = {
VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, NULL,
@@ -708,7 +709,8 @@ vector<ResourceId> VulkanReplay::GetTextures()
ResourceId id;
VkImage fakeBBIm = VK_NULL_HANDLE;
VkExtent3D fakeBBext;
m_pDriver->GetFakeBB(id, fakeBBIm, fakeBBext);
ResourceFormat fakeBBfmt;
m_pDriver->GetFakeBB(id, fakeBBIm, fakeBBext, fakeBBfmt);
texs.push_back(id);
return texs;
@@ -727,7 +729,8 @@ void VulkanReplay::PickPixel(ResourceId texture, uint32_t x, uint32_t y, uint32_
ResourceId resid;
VkImage fakeBBIm = VK_NULL_HANDLE;
VkExtent3D fakeBBext;
m_pDriver->GetFakeBB(resid, fakeBBIm, fakeBBext);
ResourceFormat fakeBBfmt;
m_pDriver->GetFakeBB(resid, fakeBBIm, fakeBBext, fakeBBfmt);
if(x >= (uint32_t)fakeBBext.width || y >= (uint32_t)fakeBBext.height)
{
@@ -806,11 +809,22 @@ void VulkanReplay::PickPixel(ResourceId texture, uint32_t x, uint32_t y, uint32_
RDCASSERT(pData != NULL);
// VKTODOHIGH assuming BGRA
pixel[2] = float(pData[0])/255.0f;
pixel[1] = float(pData[1])/255.0f;
pixel[0] = float(pData[2])/255.0f;
pixel[3] = float(pData[3])/255.0f;
// VKTODOMED this should go through render texture so that we
// just get pure F32 RGBA data out
if(fakeBBfmt.special == eSpecial_B8G8R8A8)
{
pixel[0] = float(pData[2])/255.0f;
pixel[1] = float(pData[1])/255.0f;
pixel[2] = float(pData[0])/255.0f;
pixel[3] = float(pData[3])/255.0f;
}
else
{
pixel[0] = float(pData[0])/255.0f;
pixel[1] = float(pData[1])/255.0f;
pixel[2] = float(pData[2])/255.0f;
pixel[3] = float(pData[3])/255.0f;
}
vk.vkUnmapMemory(dev, readbackmem);
@@ -840,7 +854,8 @@ bool VulkanReplay::RenderTexture(TextureDisplay cfg)
ResourceId resid;
VkImage fakeBBIm = VK_NULL_HANDLE;
VkExtent3D fakeBBext;
m_pDriver->GetFakeBB(resid, fakeBBIm, fakeBBext);
ResourceFormat fakeBBfmt;
m_pDriver->GetFakeBB(resid, fakeBBIm, fakeBBext, fakeBBfmt);
VkDevice dev = m_pDriver->GetDev();
VkCmdBuffer cmd = m_pDriver->GetCmd();
@@ -1290,7 +1305,8 @@ FetchTexture VulkanReplay::GetTexture(ResourceId id)
ResourceId resid;
VkImage fakeBBIm = VK_NULL_HANDLE;
VkExtent3D fakeBBext;
m_pDriver->GetFakeBB(resid, fakeBBIm, fakeBBext);
ResourceFormat fakeBBfmt;
m_pDriver->GetFakeBB(resid, fakeBBIm, fakeBBext, fakeBBfmt);
FetchTexture ret;
ret.arraysize = 1;
@@ -1308,15 +1324,7 @@ FetchTexture VulkanReplay::GetTexture(ResourceId id)
ret.msSamp = 1;
ret.name = "WSI Presentable Image";
ret.numSubresources = 1;
ret.format.compByteWidth = 1;
ret.format.compCount = 4;
ret.format.compType = eCompType_UNorm;
ret.format.rawType = 0;
ret.format.special = false;
ret.format.specialFormat = eSpecial_Unknown;
ret.format.srgbCorrected = false;
ret.format.strname = "B8G8R8A8_UNORM";
ret.format = fakeBBfmt;
return ret;
}
@@ -1342,7 +1350,8 @@ void VulkanReplay::SavePipelineState()
ResourceId id;
VkImage fakeBBIm = VK_NULL_HANDLE;
VkExtent3D fakeBBext;
m_pDriver->GetFakeBB(id, fakeBBIm, fakeBBext);
ResourceFormat fakeBBfmt;
m_pDriver->GetFakeBB(id, fakeBBIm, fakeBBext, fakeBBfmt);
m_D3D11PipelineState.m_OM.RenderTargets[0].Resource = id;
}