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

Win32 compile fixes (and some replay proxy fixups)

Browse Source
This commit is contained in:
baldurk
2015-12-31 17:47:36 +01:00
parent 9ac8c365ee
commit 514967ccd2
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/replay_proxy.cpp
+15 -3
View File
@@ -738,7 +738,7 @@ void Serialiser::Serialise(const char *name, VulkanPipelineState::VertexInput::A
Serialise("", el.format);
Serialise("", el.byteoffset);
SIZE_CHECK(VulkanPipelineState::VertexInput::Attribute, 48);
SIZE_CHECK(VulkanPipelineState::VertexInput::Attribute, 52);
}
template<>
@@ -751,6 +751,15 @@ void Serialiser::Serialise(const char *name, VulkanPipelineState::VertexInput &e
SIZE_CHECK(VulkanPipelineState::VertexInput, 24);
}
template<>
void Serialiser::Serialise(const char *name, VulkanPipelineState::ShaderStage::SpecInfo &el)
{
Serialise("", el.specID);
Serialise("", el.data);
SIZE_CHECK(VulkanPipelineState::ShaderStage::SpecInfo, 12);
}
template<>
void Serialiser::Serialise(const char *name, VulkanPipelineState::ShaderStage &el)
{
@@ -764,8 +773,10 @@ void Serialiser::Serialise(const char *name, VulkanPipelineState::ShaderStage &e
if(m_Mode == READING)
el.ShaderDetails = NULL;
Serialise("", el.specialization);
SIZE_CHECK(VulkanPipelineState::ShaderStage, 72);
SIZE_CHECK(VulkanPipelineState::ShaderStage, 80);
}
template<>
@@ -885,7 +896,7 @@ void Serialiser::Serialise(const char *name, VulkanPipelineState &el)
Serialise("", el.DS);
Serialise("", el.Pass);
SIZE_CHECK(VulkanPipelineState, 840);
SIZE_CHECK(VulkanPipelineState, 888);
}
#pragma endregion Vulkan pipeline state
@@ -1037,6 +1048,7 @@ void Serialiser::Serialise(const char *name, MeshFormat &el)
Serialise("", el.compCount);
Serialise("", el.compByteWidth);
Serialise("", el.compType);
Serialise("", el.bgraOrder);
Serialise("", el.specialFormat);
Serialise("", el.showAlpha);
Serialise("", el.topo);
renderdoc/driver/vulkan/vk_core.cpp
+2 -2
View File
@@ -1974,7 +1974,7 @@ void WrappedVulkan::AddDrawcall(FetchDrawcall d, bool hasEvents)
RDCASSERT(colAtt.size() < 8);
for(int i=0; i < 8 && i < colAtt.size(); i++)
for(int i=0; i < 8 && i < (int)colAtt.size(); i++)
{
RDCASSERT(colAtt[i] < atts.size());
draw.outputs[i] = atts[ colAtt[i] ].view;
@@ -1982,7 +1982,7 @@ void WrappedVulkan::AddDrawcall(FetchDrawcall d, bool hasEvents)
if(dsAtt != -1)
{
RDCASSERT(dsAtt < atts.size());
RDCASSERT(dsAtt < (int32_t)atts.size());
draw.depthOut = atts[dsAtt].view;
}
}
renderdoc/driver/vulkan/vk_debug.cpp
+1 -1
View File
@@ -1477,7 +1477,7 @@ VulkanDebugManager::~VulkanDebugManager()
GetResourceManager()->ReleaseWrappedResource(m_TextDescSet);
GetResourceManager()->ReleaseWrappedResource(m_MeshDescSet);
GetResourceManager()->ReleaseWrappedResource(m_OutlineDescSet);
if(m_QuadDescSet)
if(m_QuadDescSet != VK_NULL_HANDLE)
{
GetResourceManager()->ReleaseWrappedResource(m_MeshFetchDescSet);
GetResourceManager()->ReleaseWrappedResource(m_QuadDescSet);