lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on proxy renderer for texture description in image viewer

Browse Source
This commit is contained in:
baldurk
2019-11-20 11:55:38 +00:00
parent f6d7e2c6e4
commit 45144ed478
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/image_viewer.cpp
+11 -4
View File
@@ -60,6 +60,7 @@ public:
m_PipelineState.outputMerger.renderTargets.resize(1);
m_PipelineState.outputMerger.renderTargets[0].resourceResourceId = m_TextureID;
m_PipelineState.outputMerger.renderTargets[0].viewFormat = m_TexDetails.format;
}
virtual ~ImageViewer()
@@ -170,7 +171,7 @@ public:
}
const std::vector<ResourceDescription> &GetResources() { return m_Resources; }
std::vector<ResourceId> GetTextures() { return {m_TextureID}; }
TextureDescription GetTexture(ResourceId id) { return m_Proxy->GetTexture(m_TextureID); }
TextureDescription GetTexture(ResourceId id) { return m_TexDetails; }
void GetTextureData(ResourceId tex, const Subresource &sub, const GetTextureDataParams &params,
bytebuf &data)
{
@@ -524,16 +525,18 @@ void ImageViewer::RefreshFile()
bool dds = false;
FileIO::fseek64(f, 0, SEEK_END);
uint64_t fileSize = FileIO::ftell64(f);
FileIO::fseek64(f, 0, SEEK_SET);
if(is_exr_file(f))
{
texDetails.format = rgba32_float;
FileIO::fseek64(f, 0, SEEK_END);
uint64_t size = FileIO::ftell64(f);
FileIO::fseek64(f, 0, SEEK_SET);
std::vector<byte> buffer;
buffer.resize((size_t)size);
buffer.resize((size_t)fileSize);
FileIO::fread(buffer.data(), 1, buffer.size(), f);
@@ -747,6 +750,10 @@ void ImageViewer::RefreshFile()
if(m_TextureID == ResourceId())
RDCERR("Couldn't create proxy texture for image file");
m_TexDetails = texDetails;
m_TexDetails.resourceId = m_TextureID;
m_TexDetails.byteSize = fileSize;
if(!dds)
{
m_Proxy->SetProxyTextureData(m_TextureID, Subresource(), data, datasize);