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

Keep mesh shaders/modules around for creating pipelines on the fly

Browse Source
This commit is contained in:
baldurk
2016-02-07 18:46:03 +01:00
parent b51b50329f
commit 2d912ebe6a
2 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_debug.cpp
+56 -14
View File
@@ -457,16 +457,22 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
GetEmbeddedResource(textfs_spv),
GetEmbeddedResource(genericvs_spv),
GetEmbeddedResource(genericfs_spv),
GetEmbeddedResource(meshvs_spv),
GetEmbeddedResource(meshgs_spv),
GetEmbeddedResource(meshfs_spv),
};
bool vtxShader[] = {
true,
false,
false,
true,
false,
true,
false,
VkShaderStage shaderStages[] = {
VK_SHADER_STAGE_VERTEX,
VK_SHADER_STAGE_FRAGMENT,
VK_SHADER_STAGE_FRAGMENT,
VK_SHADER_STAGE_VERTEX,
VK_SHADER_STAGE_FRAGMENT,
VK_SHADER_STAGE_VERTEX,
VK_SHADER_STAGE_FRAGMENT,
VK_SHADER_STAGE_VERTEX,
VK_SHADER_STAGE_GEOMETRY,
VK_SHADER_STAGE_FRAGMENT,
};
enum shaderIdx
@@ -478,8 +484,15 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
TEXTFS,
GENERICVS,
GENERICFS,
MESHVS,
MESHGS,
MESHFS,
NUM_SHADERS,
};
RDCCOMPILE_ASSERT( ARRAY_COUNT(shaderSources) == ARRAY_COUNT(shaderStages), "Mismatched arrays!" );
RDCCOMPILE_ASSERT( ARRAY_COUNT(shaderSources) == NUM_SHADERS, "Mismatched arrays!" );
VkShaderModule module[ARRAY_COUNT(shaderSources)];
VkShader shader[ARRAY_COUNT(shaderSources)];
@@ -498,7 +511,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
VkShaderCreateInfo shadinfo = {
VK_STRUCTURE_TYPE_SHADER_CREATE_INFO, NULL,
Unwrap(module[i]), "main", 0,
vtxShader[i] ? VK_SHADER_STAGE_VERTEX : VK_SHADER_STAGE_FRAGMENT,
shaderStages[i],
};
vkr = vt->CreateShader(Unwrap(dev), &shadinfo, &shader[i]);
@@ -704,11 +717,31 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
for(size_t i=0; i < ARRAY_COUNT(module); i++)
{
vt->DestroyShader(Unwrap(dev), Unwrap(shader[i]));
GetResourceManager()->ReleaseWrappedResource(shader[i]);
vt->DestroyShaderModule(Unwrap(dev), Unwrap(module[i]));
GetResourceManager()->ReleaseWrappedResource(module[i]);
// hold onto the mesh shaders/modules as we create these
// pipelines later
if(i == MESHVS)
{
m_MeshShaders[0] = shader[i];
m_MeshModules[0] = module[i];
}
else if(i == MESHGS)
{
m_MeshShaders[1] = shader[i];
m_MeshModules[1] = module[i];
}
else if(i == MESHFS)
{
m_MeshShaders[2] = shader[i];
m_MeshModules[2] = module[i];
}
else
{
vt->DestroyShader(Unwrap(dev), Unwrap(shader[i]));
GetResourceManager()->ReleaseWrappedResource(shader[i]);
vt->DestroyShaderModule(Unwrap(dev), Unwrap(module[i]));
GetResourceManager()->ReleaseWrappedResource(module[i]);
}
}
VkCmdBuffer cmd = driver->GetNextCmd();
@@ -1036,6 +1069,15 @@ VulkanDebugManager::~VulkanDebugManager()
// since we don't have properly registered resources, releasing our descriptor
// pool here won't remove the descriptor sets, so we need to free our own
// tracking data (not the API objects) for descriptor sets.
for(size_t i=0; i < ARRAY_COUNT(m_MeshModules); i++)
{
vt->DestroyShader(Unwrap(dev), Unwrap(m_MeshShaders[i]));
GetResourceManager()->ReleaseWrappedResource(m_MeshShaders[i]);
vt->DestroyShaderModule(Unwrap(dev), Unwrap(m_MeshModules[i]));
GetResourceManager()->ReleaseWrappedResource(m_MeshModules[i]);
}
GetResourceManager()->ReleaseWrappedResource(m_CheckerboardDescSet);
GetResourceManager()->ReleaseWrappedResource(m_GenericDescSet);
renderdoc/driver/vulkan/vk_debug.h
+2
View File
@@ -137,6 +137,8 @@ class VulkanDebugManager
VkRenderPass m_OverlayNoDepthRP;
VkExtent2D m_OverlayDim;
VkDeviceSize m_OverlayMemSize;
VkShader m_MeshShaders[3];
VkShaderModule m_MeshModules[3];
private:
void InitDebugData();