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

Don't create illegal combinations of graphics pipelines for mesh renders

Browse Source
This commit is contained in:
baldurk
2023-12-14 15:19:40 +00:00
parent 3da12b266e
commit ec78d567dd
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.h
+2
View File
@@ -475,6 +475,7 @@ private:
bool m_MeshQueries = false;
bool m_MeshShaders = false;
bool m_TaskShaders = false;
bool m_ListRestart = false;
PFN_vkSetDeviceLoaderData m_SetDeviceLoaderData;
@@ -1272,6 +1273,7 @@ public:
bool MeshQueries() const { return m_MeshQueries; }
bool TaskShaders() const { return m_TaskShaders; }
bool MeshShaders() const { return m_MeshShaders; }
bool ListRestart() const { return m_ListRestart; }
VulkanRenderState &GetRenderState() { return m_RenderState; }
void SetActionCB(VulkanActionCallback *cb) { m_ActionCallback = cb; }
void SetSubmitChain(void *submitChain) { m_SubmitChain = submitChain; }
renderdoc/driver/vulkan/vk_rendermesh.cpp
+6 -1
View File
@@ -220,6 +220,10 @@ VKMeshDisplayPipelines VulkanDebugManager::CacheMeshDisplayPipelines(VkPipelineL
ia.primitiveRestartEnable = primary.allowRestart;
if((primary.topology == Topology::LineList || primary.topology == Topology::TriangleList) &&
!m_pDriver->ListRestart())
ia.primitiveRestartEnable = false;
VkRect2D scissor = {{0, 0}, {16384, 16384}};
VkPipelineViewportStateCreateInfo vp = {
@@ -432,7 +436,8 @@ VKMeshDisplayPipelines VulkanDebugManager::CacheMeshDisplayPipelines(VkPipelineL
stages[2].stage = VK_SHADER_STAGE_GEOMETRY_BIT;
pipeInfo.stageCount = 3;
if(stages[2].module != VK_NULL_HANDLE && ia.topology != VK_PRIMITIVE_TOPOLOGY_POINT_LIST)
if(stages[2].module != VK_NULL_HANDLE && ia.topology != VK_PRIMITIVE_TOPOLOGY_POINT_LIST &&
ia.topology != VK_PRIMITIVE_TOPOLOGY_LINE_LIST)
{
vkr = vt->CreateGraphicsPipelines(Unwrap(m_Device), VK_NULL_HANDLE, 1, &pipeInfo, NULL,
&cache.pipes[VKMeshDisplayPipelines::ePipe_Lit]);
renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+2
View File
@@ -2603,6 +2603,8 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
{
CHECK_PHYS_EXT_FEATURE(primitiveTopologyListRestart);
CHECK_PHYS_EXT_FEATURE(primitiveTopologyPatchListRestart);
m_ListRestart = ext->primitiveTopologyListRestart;
}
END_PHYS_EXT_CHECK();